Changeset 12761

Timestamp:

12/17/11 23:52:19 (17 months ago)

Author:

plg

Message:

merge r12760 from branch 2.3 to trunk

bug 2502 fixed: better handling of non-latin tags and multilanguage tags on
tags.php with mode letter.

We can't rely on url_name because it always start with "_" when the tag looks
like "[lang...". Instead we compute a str2url on the name, but once it has been
rendered by Extended Description. To avoid useless computations, I have added a
cache on the tag_alpha_compare function. Tested on a 175 tags set, speed is
good.

Location:

trunk

Files:

• include/functions_html.inc.php (modified) (1 diff)
• tags.php (modified) (2 diffs)

trunk/include/functions_html.inc.php

@@ -295 +295 @@
 function tag_alpha_compare($a, $b)
 {
-  return strcmp(strtolower($a['url_name']), strtolower($b['url_name']));
+  global $page;
+  
+  foreach (array($a, $b) as $tag)
+  {
+    if (!isset($page[__FUNCTION__.'_cache'][ $tag['name'] ]))
+    {
+      $page[__FUNCTION__.'_cache'][ $tag['name'] ] = strtolower(str2url($tag['name']));
+    }
+  }
+
+  return strcmp($page[__FUNCTION__.'_cache'][ $a['name'] ], $page[__FUNCTION__.'_cache'][ $b['name'] ]);
 }
 

trunk/tags.php

@@ -100 +100 @@
   foreach ($tags as $tag)
   {
-    $tag_letter = strtoupper(substr($tag['url_name'], 0, 1));
+    $tag_letter = strtoupper(mb_substr(str2url($tag['name']), 0, 1, 'utf-8'));
 
     if ($current_tag_idx==0) {
@@ -172 +172 @@
 
 // we want tags diplayed in alphabetic order
-usort($tags, 'tag_alpha_compare');
+if ('letters' != $page['display_mode'])
+{
+  usort($tags, 'tag_alpha_compare');
+}
 
 // display sorted tags