diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-03-07 16:24:49 +0100 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-03-07 16:24:49 +0100 |
| commit | a4543175cea05373906ce7f9507af597a78c5dc4 (patch) | |
| tree | 291e127ddc223edb2c5bbb7ba6f68d4e3145530e | |
| parent | 9f015337102193ae7cff59b47c577f15c05259c4 (diff) | |
| download | nextcloud-server-a4543175cea05373906ce7f9507af597a78c5dc4.tar.gz nextcloud-server-a4543175cea05373906ce7f9507af597a78c5dc4.zip | |
make gallary work with archives
| -rw-r--r-- | apps/gallery/ajax/galleryOp.php | 1 | ||||
| -rw-r--r-- | apps/gallery/lib/scanner.php | 2 |
2 files changed, 1 insertions, 2 deletions
diff --git a/apps/gallery/ajax/galleryOp.php b/apps/gallery/ajax/galleryOp.php index ee919daeacb..74ac905d072 100644 --- a/apps/gallery/ajax/galleryOp.php +++ b/apps/gallery/ajax/galleryOp.php @@ -95,7 +95,6 @@ function handleGetGallery($path) { else $path = '/'.ltrim($path, '/'); if (strlen($path) > 1) $path = rtrim($path, '/'); - error_log($path); $result = OC_Gallery_Album::find(OC_User::getUser(), null, $path); $album_details = $result->fetchRow(); diff --git a/apps/gallery/lib/scanner.php b/apps/gallery/lib/scanner.php index 8dcd77821cb..1e8fdb63fb3 100644 --- a/apps/gallery/lib/scanner.php +++ b/apps/gallery/lib/scanner.php @@ -47,7 +47,7 @@ class OC_Gallery_Scanner { $current_album = array('name'=> $path, 'imagesCount' => 0, 'images' => array()); $current_album['name'] = self::createName($current_album['name']); - if ($dh = OC_Filesystem::opendir($path)) { + if ($dh = OC_Filesystem::opendir($path.'/')) { while (($filename = readdir($dh)) !== false) { $filepath = ($path[strlen($path)-1]=='/'?$path:$path.'/').$filename; if (substr($filename, 0, 1) == '.') continue; |