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

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'),