aboutsummaryrefslogtreecommitdiffstats
path: root/admin/batch_manager.php
diff options
context:
space:
mode:
authorrvelices <rv-github@modusoptimus.com>2012-08-01 17:00:07 +0000
committerrvelices <rv-github@modusoptimus.com>2012-08-01 17:00:07 +0000
commit4b181b746fa3660f63de96373caf66686cc470b4 (patch)
treea2b71753b2d1421b5e54d425f54561db3fb8c1e6 /admin/batch_manager.php
parenta7895bf67b2596ddef101bf7b11ab9b53ab32b9e (diff)
merge -r17289 from trunk to 2.4: batch manager improvements/fixes:
- when refreshing photo set, start is set to 0 (otherwise if the new set is smaller that start, it looks like it is empty) - correct positioning of thumbnails (width/height) is done in template instead of javascript (immediate instead on ready + no reflows) - less space lost on batch manager page - fix wrong page title in batch manager because of global variable $title overriden - fix language keys in element_set_ranks (capital/lowercase issue) git-svn-id: http://piwigo.org/svn/branches/2.4@17290 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin/batch_manager.php')
-rw-r--r--admin/batch_manager.php12
1 files changed, 6 insertions, 6 deletions
diff --git a/admin/batch_manager.php b/admin/batch_manager.php
index 113d4c629..7869e4cc2 100644
--- a/admin/batch_manager.php
+++ b/admin/batch_manager.php
@@ -50,7 +50,7 @@ check_input_parameter('selection', $_POST, true, PATTERN_ID);
if (isset($_POST['submitFilter']))
{
// echo '<pre>'; print_r($_POST); echo '</pre>';
-
+ unset($_REQUEST['start']); // new photo set must reset the page
$_SESSION['bulk_manager_filter'] = array();
if (isset($_POST['filter_prefilter_use']))
@@ -335,16 +335,16 @@ $page['cat_elements_id'] = $current_set;
// category. For exampe, $page['start'] = 12 means we must show elements #12
// and $page['nb_images'] next elements
-if (!isset($_GET['start'])
- or !is_numeric($_GET['start'])
- or $_GET['start'] < 0
- or (isset($_GET['display']) and 'all' == $_GET['display']))
+if (!isset($_REQUEST['start'])
+ or !is_numeric($_REQUEST['start'])
+ or $_REQUEST['start'] < 0
+ or (isset($_REQUEST['display']) and 'all' == $_REQUEST['display']))
{
$page['start'] = 0;
}
else
{
- $page['start'] = $_GET['start'];
+ $page['start'] = $_REQUEST['start'];
}
// +-----------------------------------------------------------------------+