- 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
This commit is contained in:
rvelices
2008-10-18 00:45:45 +00:00
parent faa543851b
commit 90be9fbb84
5 changed files with 25 additions and 65 deletions
+3 -2
View File
@@ -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';
}
}
?>
?>