summaryrefslogtreecommitdiffstats
path: root/apps/gallery/lib
diff options
context:
space:
mode:
authorBartek Przybylski <bart.p.pl@gmail.com>2012-02-04 11:02:13 +0100
committerBartek Przybylski <bart.p.pl@gmail.com>2012-02-04 11:02:13 +0100
commitf1672d7d10477026cfa4f49a8ec7c71e03f3f6ba (patch)
treed5a4b34d62de98bd9da7342be84e38bda9ef72a3 /apps/gallery/lib
parent5a106d10361865dfd5cffe8809caee73ff410c4c (diff)
downloadnextcloud-server-f1672d7d10477026cfa4f49a8ec7c71e03f3f6ba.tar.gz
nextcloud-server-f1672d7d10477026cfa4f49a8ec7c71e03f3f6ba.zip
handling special chars in dirnames
Diffstat (limited to 'apps/gallery/lib')
-rw-r--r--apps/gallery/lib/album.php1
-rw-r--r--apps/gallery/lib/scanner.php2
2 files changed, 1 insertions, 2 deletions
diff --git a/apps/gallery/lib/album.php b/apps/gallery/lib/album.php
index 167813a1a31..502237481a9 100644
--- a/apps/gallery/lib/album.php
+++ b/apps/gallery/lib/album.php
@@ -54,7 +54,6 @@ class OC_Gallery_Album {
public static function removeByPath($path, $owner) {
$album = self::find($owner, null, $path);
$album = $album->fetchRow();
- error_log($path . '--' . $album['album_name']);
self::remove($owner, $album['album_name']);
OC_Gallery_Photo::removeByAlbumId($album['album_id']);
// find and remove any gallery which might be stored lower in dir hierarchy
diff --git a/apps/gallery/lib/scanner.php b/apps/gallery/lib/scanner.php
index dfb9edebfea..2af63d8bf0e 100644
--- a/apps/gallery/lib/scanner.php
+++ b/apps/gallery/lib/scanner.php
@@ -106,7 +106,7 @@ class OC_Gallery_Scanner {
if (self::isPhoto($path.$file)) $addpath = TRUE;
}
- if ($addpath) $ret[] = $path;
+ if ($addpath) $ret[] = urlencode($path);
return $ret;
}