aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2005-11-25 22:47:37 +0000
committerplegall <plg@piwigo.org>2005-11-25 22:47:37 +0000
commitc3ed211ac8b02f8b22bc0594edf4cb440768c2c9 (patch)
tree89140848ad3cc383b494238c0785634639c60e56
parent3ecdb1300b3919408cc3dd51efcbc242593f07cd (diff)
- merge branch 1.5 r954:955 into BSF (bug 219 fixed)
git-svn-id: http://piwigo.org/svn/trunk@956 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to '')
-rw-r--r--admin/element_set.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/admin/element_set.php b/admin/element_set.php
index 82920d9a8..f02804c27 100644
--- a/admin/element_set.php
+++ b/admin/element_set.php
@@ -167,7 +167,8 @@ SELECT DISTINCT(image_id)
if (!isset($_GET['start'])
or !is_numeric($_GET['start'])
- or $_GET['start'] < 0)
+ or $_GET['start'] < 0
+ or (isset($_GET['display']) and 'all' == $_GET['display']))
{
$page['start'] = 0;
}