diff options
author | plegall <plg@piwigo.org> | 2014-09-01 08:35:09 +0000 |
---|---|---|
committer | plegall <plg@piwigo.org> | 2014-09-01 08:35:09 +0000 |
commit | 27e5977d85333d69ca43621d8b74b1652762348a (patch) | |
tree | d89fa8acccfe1ee723e8d8bebd9ad56bf4791b1e /admin | |
parent | f29a7f698cc1f7a7d1af8af58c64e2e0461a9979 (diff) |
bug 3074: no more than 50 photos per page on Batch Manager, unit mode (better fix expected with feature 3106)
git-svn-id: http://piwigo.org/svn/trunk@29349 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin')
-rw-r--r-- | admin/batch_manager_unit.php | 9 | ||||
-rw-r--r-- | admin/themes/default/template/batch_manager_unit.tpl | 1 |
2 files changed, 1 insertions, 9 deletions
diff --git a/admin/batch_manager_unit.php b/admin/batch_manager_unit.php index f121126dd..bed0cdc1c 100644 --- a/admin/batch_manager_unit.php +++ b/admin/batch_manager_unit.php @@ -133,14 +133,7 @@ $template->assign( // how many items to display on this page if (!empty($_GET['display'])) { - if ('all' == $_GET['display']) - { - $page['nb_images'] = count($page['cat_elements_id']); - } - else - { - $page['nb_images'] = intval($_GET['display']); - } + $page['nb_images'] = intval($_GET['display']); } else { diff --git a/admin/themes/default/template/batch_manager_unit.tpl b/admin/themes/default/template/batch_manager_unit.tpl index 18671242b..ccb7ca152 100644 --- a/admin/themes/default/template/batch_manager_unit.tpl +++ b/admin/themes/default/template/batch_manager_unit.tpl @@ -43,7 +43,6 @@ jQuery("a.preview-box").colorbox(); <a href="{$U_ELEMENTS_PAGE}&display=5">5</a> | <a href="{$U_ELEMENTS_PAGE}&display=10">10</a> | <a href="{$U_ELEMENTS_PAGE}&display=50">50</a> - | <a href="{$U_ELEMENTS_PAGE}&display=all">{'all'|@translate}</a> </p> </fieldset> |