From c324cbed9c18bf0f1433e08d0189ba1103b7a9e6 Mon Sep 17 00:00:00 2001
From: Jared Hancock <jared@osticket.com>
Date: Wed, 18 Jun 2014 07:50:17 -0500
Subject: [PATCH] topics: Properly sort help topics on faq manage
Previously, they were displayed in seemingly random order, did not honor
proper nesting, or declared sort order.
---
include/staff/faq.inc.php | 7 ++-----
1 file changed, 2 insertions(+), 5 deletions(-)
diff --git a/include/staff/faq.inc.php b/include/staff/faq.inc.php
index 9bb484f40..8dbaa2ecd 100644
--- a/include/staff/faq.inc.php
+++ b/include/staff/faq.inc.php
@@ -116,10 +116,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</td>
</tr>
<?php
- $sql='SELECT ht.topic_id, CONCAT_WS(" / ", pht.topic, ht.topic) as name '
- .' FROM '.TOPIC_TABLE.' ht '
- .' LEFT JOIN '.TOPIC_TABLE.' pht ON(pht.topic_id=ht.topic_pid) ';
- if(($res=db_query($sql)) && db_num_rows($res)) { ?>
+ if ($topics = Topic::getAllHelpTopics()) { ?>
<tr>
<th colspan="2">
<em><strong>Help Topics</strong>: Check all help topics related to this FAQ.</em>
@@ -127,7 +124,7 @@ $info=Format::htmlchars(($errors && $_POST)?$_POST:$info);
</tr>
<tr><td colspan="2">
<?php
- while(list($topicId,$topic)=db_fetch_row($res)) {
+ while (list($topicId,$topic) = each($topics)) {
echo sprintf('<input type="checkbox" name="topics[]" value="%d" %s>%s<br>',
$topicId,
(($info['topics'] && in_array($topicId,$info['topics']))?'checked="checked"':''),
--
GitLab