diff options
| author | Bartek Przybylski <bart.p.pl@gmail.com> | 2012-06-10 17:25:19 +0200 |
|---|---|---|
| committer | Bartek Przybylski <bart.p.pl@gmail.com> | 2012-06-10 17:25:50 +0200 |
| commit | c11f6cc3f9121fbb337c248807b802c72b18087b (patch) | |
| tree | 36cdbad6070e3d3fc2361fb12441a46304be4a20 | |
| parent | 76f20eb57c4089b51ee506a000a21ab95727da43 (diff) | |
| download | nextcloud-server-c11f6cc3f9121fbb337c248807b802c72b18087b.tar.gz nextcloud-server-c11f6cc3f9121fbb337c248807b802c72b18087b.zip | |
fix variable name and undefined index notice
| -rw-r--r-- | apps/gallery/templates/index.php | 2 | ||||
| -rw-r--r-- | lib/image.php | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/apps/gallery/templates/index.php b/apps/gallery/templates/index.php index e761cb54725..fd83490d60c 100644 --- a/apps/gallery/templates/index.php +++ b/apps/gallery/templates/index.php @@ -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]); diff --git a/lib/image.php b/lib/image.php index d72960101f0..e5c59bacdc5 100644 --- a/lib/image.php +++ b/lib/image.php @@ -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; |