Additional fix for topic

Geeklog-Core · Jan 23, 2017 · 7053ac0 · 7053ac0
1 parent 8ede9c2
commit 7053ac0
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 6 deletions.
diff --git a/public_html/index.php b/public_html/index.php
@@ -404,7 +404,7 @@ function fixTopic(&$A, $tid_list)
     } else {
         $topic_url = '';
         if (!empty($topic)) {
-            $topic_url = COM_buildURL($_CONF['site_url'] . '/index.php?topic=' . $topic);
+            $topic_url = TOPIC_getUrl($topic);
         }
         COM_handle404($topic_url);
     }

diff --git a/system/lib-admin.php b/system/lib-admin.php
@@ -1716,7 +1716,7 @@ function ADMIN_getListField_topics($fieldName, $fieldValue, $A, $icon_arr, $toke
                 $image_tag = '<img src="' . $imageUrl
                     . '" width="24" height="24" id="topic-' . $A['tid']
                     . '" class="admin-topic-image" alt=""' . XHTML . '>';
-                $url = COM_buildURL($_CONF['site_url'] . '/index.php?topic=' . $A['tid']);
+                $url = TOPIC_getUrl($A['tid']);
                 $retval = COM_createLink($image_tag, $url);
             }
             break;
@@ -1733,7 +1733,7 @@ function ADMIN_getListField_topics($fieldName, $fieldValue, $A, $icon_arr, $toke
             $level *= 15;
 
             $content = '<span style="margin-left:' . $level . 'px">' . $fieldValue . '</span>';
-            $url = COM_buildURL($_CONF['site_url'] . '/index.php?topic=' . $A['tid']);
+            $url = TOPIC_getUrl($A['tid']);
             $retval = COM_createLink($content, $url) . $default;
             break;
 

diff --git a/system/lib-syndication.php b/system/lib-syndication.php
@@ -306,7 +306,7 @@ function SYND_getFeedContentPerTopic($tid, $limit, &$link, &$update, $contentLen
         }
     }
 
-    $link = COM_buildURL($_CONF['site_url'] . '/index.php?topic=' . $tid);
+    $link = TOPIC_getUrl($tid);
     $update = implode(',', $sids);
 
     return $content;

diff --git a/system/lib-topic.php b/system/lib-topic.php
@@ -1459,7 +1459,7 @@ function TOPIC_relatedTopics($type, $id, $max = 6, $tids = array())
         $topicrelated->set_var('lang_filed_under', $LANG27['filed_under:']);
         for ($i = 0; $i < $nrows; $i++) {
             $A = DB_fetchArray($result);
-            $url = COM_buildURL($_CONF['site_url'] . '/index.php?topic=' . $A['tid']);
+            $url = TOPIC_getUrl($A['tid']);
 
             $topicrelated->set_var('topic_url', $url);
             $topicrelated->set_var('topic', $A['topic']);
@@ -1655,7 +1655,7 @@ function plugin_autotags_topic($op, $content = '', $autotag = '')
                 $result = DB_query($sql);
                 $A = DB_fetchArray($result);
                 if ($A['count'] == 1) {
-                    $url = COM_buildUrl($_CONF['site_url'] . '/index.php?topic=' . $tid);
+                    $url = TOPIC_getUrl($tid);
                     $linktext = $autotag['parm2'];
                     if (empty($linktext)) {
                         $linktext = stripslashes(DB_getItem($_TABLES['topics'], 'topic', "tid = '$tid'"));