зеркало из https://github.com/nextcloud/server.git
fix variable name and undefined index notice
This commit is contained in:
Родитель
76f20eb57c
Коммит
c11f6cc3f9
|
@ -82,7 +82,7 @@ sort($images);
|
|||
$arr = array();
|
||||
$tl = new \OC\Pictures\TilesLine();
|
||||
$ts = new \OC\Pictures\TileStack(array(), '');
|
||||
$previous_element = $images[0];
|
||||
$previous_element = @$images[0];
|
||||
for($i = 0; $i < count($images); $i++) {
|
||||
$prev_dir_arr = explode('/', $previous_element);
|
||||
$dir_arr = explode('/', $images[$i]);
|
||||
|
|
|
@ -409,7 +409,7 @@ class OC_Image {
|
|||
default:
|
||||
|
||||
// this is mostly file created from encrypted file
|
||||
$this->resource = imagecreatefromstring(\OC_Filesystem::file_get_contents(\OC_Filesystem::getLocalPath($newimgpath)));
|
||||
$this->resource = imagecreatefromstring(\OC_Filesystem::file_get_contents(\OC_Filesystem::getLocalPath($imagepath)));
|
||||
$itype = IMAGETYPE_PNG;
|
||||
OC_Log::write('core','OC_Image->loadFromFile, Default', OC_Log::DEBUG);
|
||||
break;
|
||||
|
|
Загрузка…
Ссылка в новой задаче