Changeset 1310 for trunk

Timestamp:

May 15, 2006, 11:22:43 PM (19 years ago)

Author:

plg

Message:

merge -r1308:1309 from branch 1.6 to trunk (bug 367 fixed)

Location:

trunk

Files:

• admin/element_set_global.php (modified) (2 diffs)
• include/functions_html.inc.php (modified) (1 diff)
• include/functions_tag.inc.php (modified) (2 diffs)

trunk/admin/element_set_global.php

@@ -294 +294 @@
     WHERE image_id IN ('.implode(',', $page['cat_elements_id']).')
     GROUP BY tag_id
-    ORDER BY name ASC
   ;';
   $result = pwg_query($query);
@@ -303 +302 @@
     array_push($tags, $row);
   }
+
+  usort($tags, 'name_compare');
 
   $template->assign_vars(

trunk/include/functions_html.inc.php

@@ -564 +564 @@
 function name_compare($a, $b)
 {
-  return strcmp($a['name'], $b['name']);
+  return strcmp(strtolower($a['name']), strtolower($b['name']));
 }
 

trunk/include/functions_tag.inc.php

@@ -92 +92 @@
 {
   $query = '
-SELECT id AS tag_id, name, url_name
+SELECT id AS tag_id,
+       name,
+       url_name
   FROM '.TAGS_TABLE.'
-  ORDER BY name
 ;';
   $result = pwg_query($query);
@@ -104 +105 @@
     array_push($tags, $row);
   }
+
+  usort($tags, 'name_compare');
 
   return $tags;