From 25ed7b89d368001006caa1c2bdc12c811d589b46 Mon Sep 17 00:00:00 2001 From: rub Date: Thu, 19 Apr 2007 06:04:04 +0000 Subject: Small improvement: order group by name Change cat_*.php header Merge BSF 1959:1961 into branch-1_7 git-svn-id: http://piwigo.org/svn/branches/branch-1_7@1962 68402e56-0260-453c-a942-63ccdbb3a9ee --- admin/cat_move.php | 5 ++--- admin/cat_options.php | 5 ++--- admin/cat_perm.php | 6 +++--- admin/group_list.php | 2 +- admin/user_list.php | 1 + 5 files changed, 9 insertions(+), 10 deletions(-) diff --git a/admin/cat_move.php b/admin/cat_move.php index 9150ca4fa..1532641d1 100644 --- a/admin/cat_move.php +++ b/admin/cat_move.php @@ -2,10 +2,9 @@ // +-----------------------------------------------------------------------+ // | PhpWebGallery - a PHP based picture gallery | // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net | -// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net | +// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net | // +-----------------------------------------------------------------------+ -// | branch : BSF (Best So Far) -// | file : $RCSfile$ +// | file : $Id$ // | last update : $Date$ // | last modifier : $Author$ // | revision : $Revision$ diff --git a/admin/cat_options.php b/admin/cat_options.php index cbc729dc5..13f8d0b80 100644 --- a/admin/cat_options.php +++ b/admin/cat_options.php @@ -2,10 +2,9 @@ // +-----------------------------------------------------------------------+ // | PhpWebGallery - a PHP based picture gallery | // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net | -// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net | +// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net | // +-----------------------------------------------------------------------+ -// | branch : BSF (Best So Far) -// | file : $RCSfile$ +// | file : $Id$ // | last update : $Date$ // | last modifier : $Author$ // | revision : $Revision$ diff --git a/admin/cat_perm.php b/admin/cat_perm.php index 3782d7190..eb0efa3cd 100644 --- a/admin/cat_perm.php +++ b/admin/cat_perm.php @@ -2,10 +2,9 @@ // +-----------------------------------------------------------------------+ // | PhpWebGallery - a PHP based picture gallery | // | Copyright (C) 2002-2003 Pierrick LE GALL - pierrick@phpwebgallery.net | -// | Copyright (C) 2003-2005 PhpWebGallery Team - http://phpwebgallery.net | +// | Copyright (C) 2003-2007 PhpWebGallery Team - http://phpwebgallery.net | // +-----------------------------------------------------------------------+ -// | branch : BSF (Best So Far) -// | file : $RCSfile$ +// | file : $Id$ // | last update : $Date$ // | last modifier : $Author$ // | revision : $Revision$ @@ -229,6 +228,7 @@ $groups = array(); $query = ' SELECT id, name FROM '.GROUPS_TABLE.' + ORDER BY name ASC ;'; $result = pwg_query($query); diff --git a/admin/group_list.php b/admin/group_list.php index ccb5a5b80..c5bd7ac70 100644 --- a/admin/group_list.php +++ b/admin/group_list.php @@ -168,7 +168,7 @@ $template->assign_vars( $query = ' SELECT id, name, is_default FROM '.GROUPS_TABLE.' - ORDER BY id ASC + ORDER BY name ASC ;'; $result = pwg_query($query); diff --git a/admin/user_list.php b/admin/user_list.php index bef1005fb..57d1788a1 100644 --- a/admin/user_list.php +++ b/admin/user_list.php @@ -429,6 +429,7 @@ $groups = array(); $query = ' SELECT id, name FROM '.GROUPS_TABLE.' + ORDER BY name ASC ;'; $result = pwg_query($query); -- cgit v1.2.3