wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

make gallary work with archives

Browse source
This commit is contained in:
Robin Appelman 2012-03-07 16:24:49 +01:00
parent 9f01533710
commit a4543175ce
2 changed files with 1 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
apps/gallery/ajax/galleryOp.php
View file

@ -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();

2
apps/gallery/lib/scanner.php
View file

@ -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;