[geeklog-hg] geeklog: For related topics when an object is specified make sur...

[geeklog-cvs at lists.geeklog.net]

changeset 9347:cbd8f8ed4339
url:  http://project.geeklog.net/cgi-bin/hgwebdir.cgi/geeklog/rev/cbd8f8ed4339
user: Tom <websitemaster at cogeco.net>
date: Fri Dec 13 07:15:03 2013 -0500
description:
For related topics when an object is specified make sure the default topic is listed first since it is considered the most important

diffstat:

 system/lib-topic.php |  8 ++++++--
 1 files changed, 6 insertions(+), 2 deletions(-)

diffs (18 lines):

diff -r 722c47398abf -r cbd8f8ed4339 system/lib-topic.php
--- a/system/lib-topic.php	Wed Dec 11 20:44:13 2013 -0500
+++ b/system/lib-topic.php	Fri Dec 13 07:15:03 2013 -0500
@@ -1492,8 +1492,12 @@
             FROM {$_TABLES['topics']} t   
             WHERE (tid IN ('" . implode( "','", $tids ) . "'))"; 
     }
-    $sql .= COM_getPermSQL('AND') . "
-        ORDER BY topic ASC";
+    $sql .= COM_getPermSQL('AND');
+    if ($from_db) {
+        $sql .= " ORDER BY tdefault DESC, topic ASC";
+    } else {
+        $sql .= " ORDER BY topic ASC";        
+    }
     if ($max > 0) {    
         $sql .= " LIMIT " . $max;
     }