aboutsummaryrefslogtreecommitdiffstats
path: root/admin
diff options
context:
space:
mode:
authorplegall <plg@piwigo.org>2006-05-15 21:22:43 +0000
committerplegall <plg@piwigo.org>2006-05-15 21:22:43 +0000
commitfc986780f925516cff2000aba129c7de83732110 (patch)
tree02fd904fc2003f0d9758607927ee3a21a803be7e /admin
parent82e74dc53f0f3ac13b50ee563fed4213911994aa (diff)
merge -r1308:1309 from branch 1.6 to trunk (bug 367 fixed)
git-svn-id: http://piwigo.org/svn/trunk@1310 68402e56-0260-453c-a942-63ccdbb3a9ee
Diffstat (limited to 'admin')
-rw-r--r--admin/element_set_global.php3
1 files changed, 2 insertions, 1 deletions
diff --git a/admin/element_set_global.php b/admin/element_set_global.php
index 1c1013727..5dbe4a18b 100644
--- a/admin/element_set_global.php
+++ b/admin/element_set_global.php
@@ -293,7 +293,6 @@ if (count($page['cat_elements_id']) > 0)
INNER JOIN '.TAGS_TABLE.' ON tag_id = id
WHERE image_id IN ('.implode(',', $page['cat_elements_id']).')
GROUP BY tag_id
- ORDER BY name ASC
;';
$result = pwg_query($query);
@@ -303,6 +302,8 @@ if (count($page['cat_elements_id']) > 0)
array_push($tags, $row);
}
+ usort($tags, 'name_compare');
+
$template->assign_vars(
array(
'DEL_TAG_SELECTION' => get_html_tag_selection($tags, 'del_tags'),