Tag cloud is now definitely sorted by rawname MDL-10982

diff --git a/tag/lib.php b/tag/lib.php
index a4e4b33242aff3f320224f93e497e02828284e93..b120f0b518dfa0edac674560baa08d34b77d613b 100644 (file)
--- a/tag/lib.php
+++ b/tag/lib.php
@@ -1138,7 +1138,7 @@ function popular_tags_count($nr_of_tags=20, $tag_type = 'default') {
 
     $query = "
         SELECT 
-            tg.id, tg.name, tg.rawname, COUNT(ti.id) AS count, tg.flag 
+            tg.rawname, tg.id, tg.name, COUNT(ti.id) AS count, tg.flag 
         FROM 
             {$CFG->prefix}tag_instance ti 
         INNER JOIN 
@@ -1438,11 +1438,11 @@ function print_tag_cloud($tagcloud, $shuffle=true, $max_size=180, $min_size=80)
         return;
     }
 
-    sort($tagcloud);
-
-    if ( $shuffle ) {
+    if ($shuffle) {
         shuffle($tagcloud);
-    }    
+    } else {
+        ksort($tagcloud);
+    }
     
     $count = array();
     foreach ($tagcloud as $key => $value){

diff --git a/tag/search.php b/tag/search.php
index 4ad16648b1373595e4d4dd87a3a7019cd6be6017..936e89f4f93d35e008753f9cda2156cd475895db 100644 (file)
--- a/tag/search.php
+++ b/tag/search.php
@@ -37,7 +37,7 @@ if(!empty($query)) {
 echo '<br/><br/>';
 
 print_box_start('generalbox', 'big-tag-cloud-box');
-print_tag_cloud(popular_tags_count(60), true, 170,70);
+print_tag_cloud(popular_tags_count(60), false, 170,70);
 print_box_end();
 
 print_footer();