diff options
| author | Brice Maron <brice@bmaron.net> | 2012-06-07 19:11:55 +0000 |
|---|---|---|
| committer | Brice Maron <brice@bmaron.net> | 2012-06-07 19:11:55 +0000 |
| commit | cf02f3c1078b4b46fbf20d6269759b2b9b55aed8 (patch) | |
| tree | bc299b72312734184deae602d87c57b0d45dee6d /apps/gallery/index.php | |
| parent | e8447e0bda25744c4836a8fdf009a98174264eda (diff) | |
| parent | d4f6f3e9355979aedb174d6f9b5f60380934aca9 (diff) | |
| download | nextcloud-server-cf02f3c1078b4b46fbf20d6269759b2b9b55aed8.tar.gz nextcloud-server-cf02f3c1078b4b46fbf20d6269759b2b9b55aed8.zip | |
Merge branch 'master' into multi_app_dir
Diffstat (limited to 'apps/gallery/index.php')
| -rw-r--r-- | apps/gallery/index.php | 24 |
1 files changed, 2 insertions, 22 deletions
diff --git a/apps/gallery/index.php b/apps/gallery/index.php index a9fe200c4e4..9d4654a7cc5 100644 --- a/apps/gallery/index.php +++ b/apps/gallery/index.php @@ -27,26 +27,6 @@ OCP\User::checkLoggedIn(); OCP\App::checkAppEnabled('gallery'); OCP\App::setActiveNavigationEntry( 'gallery_index' ); -if (!isset($_GET['view'])) { - $result = OC_Gallery_Album::find(OCP\USER::getUser()); - - $r = array(); - while ($row = $result->fetchRow()) - $r[] = $row; - - $tmpl = new OCP\Template( 'gallery', 'index', 'user' ); - $tmpl->assign('r', $r); - $tmpl->printPage(); -} else { - $result = OC_Gallery_Photo::findForAlbum(OCP\USER::getUser(), $_GET['view']); - - $photos = array(); - while ($p = $result->fetchRow()) - $photos[] = $p['file_path']; - - $tmpl = new OCP\Template( 'gallery', 'view_album', 'user' ); - $tmpl->assign('photos', $photos); - $tmpl->assign('albumName', $_GET['view']); - $tmpl->printPage(); -} +$tmpl = new OCP\Template( 'gallery', 'index', 'user' ); +$tmpl->printPage(); ?> |