From 90be9fbb84623095a360cfa6e9c1955a891eeba5 Mon Sep 17 00:00:00 2001 From: rvelices Date: Sat, 18 Oct 2008 00:45:45 +0000 Subject: - merge rev 2765,2769 from branch 2.0 * 2765 mysql potential injection paranoia + code compaction in common.inc.php * 2769 added an image sort order by privacy level (admins only) * 2769 fix an IE6 display issue with quick search on index page git-svn-id: http://piwigo.org/svn/trunk@2770 68402e56-0260-453c-a942-63ccdbb3a9ee --- include/functions_category.inc.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) (limited to 'include/functions_category.inc.php') diff --git a/include/functions_category.inc.php b/include/functions_category.inc.php index 26c9478ef..0705b852b 100644 --- a/include/functions_category.inc.php +++ b/include/functions_category.inc.php @@ -273,7 +273,8 @@ function get_category_preferred_image_orders() l10n('Rank'), 'rank ASC', ('categories' == @$page['section'] and !isset($page['flat']) and !isset($page['chronology_field']) ) - ) + ), + array( l10n('permissions'), 'level DESC', is_admin() ) )); } @@ -522,4 +523,4 @@ LIMIT 1'; } } -?> +?> \ No newline at end of file -- cgit v1.2.3