From 613e4c2fa17e74fa18003df66b9847df7691c7f7 Mon Sep 17 00:00:00 2001
From: Peter Rotich <peter@enhancesoft.com>
Date: Wed, 23 Oct 2013 19:23:33 +0000
Subject: [PATCH] Order FAQ by question.
---
include/client/faq-category.inc.php | 3 ++-
include/client/knowledgebase.inc.php | 2 +-
include/staff/faq-categories.inc.php | 2 +-
include/staff/faq-category.inc.php | 2 +-
4 files changed, 5 insertions(+), 4 deletions(-)
diff --git a/include/client/faq-category.inc.php b/include/client/faq-category.inc.php
index 50a51782f..32b4a9c63 100644
--- a/include/client/faq-category.inc.php
+++ b/include/client/faq-category.inc.php
@@ -11,7 +11,8 @@ $sql='SELECT faq.faq_id, question, count(attach.file_id) as attachments '
.' FROM '.FAQ_TABLE.' faq '
.' LEFT JOIN '.FAQ_ATTACHMENT_TABLE.' attach ON(attach.faq_id=faq.faq_id) '
.' WHERE faq.ispublished=1 AND faq.category_id='.db_input($category->getId())
- .' GROUP BY faq.faq_id';
+ .' GROUP BY faq.faq_id '
+ .' ORDER BY question';
if(($res=db_query($sql)) && db_num_rows($res)) {
echo '
<h2>Frequently Asked Questions</h2>
diff --git a/include/client/knowledgebase.inc.php b/include/client/knowledgebase.inc.php
index 1d00ca59c..79bfa6836 100644
--- a/include/client/knowledgebase.inc.php
+++ b/include/client/knowledgebase.inc.php
@@ -78,7 +78,7 @@ if($_REQUEST['q'] || $_REQUEST['cid'] || $_REQUEST['topicId']) { //Search.
)";
}
- $sql.=' GROUP BY faq.faq_id';
+ $sql.=' GROUP BY faq.faq_id ORDER BY question';
echo "<div><strong>Search Results</strong></div><div class='clear'></div>";
if(($res=db_query($sql)) && ($num=db_num_rows($res))) {
echo '<div id="faq">'.$num.' FAQs matched your search criteria.
diff --git a/include/staff/faq-categories.inc.php b/include/staff/faq-categories.inc.php
index cf8d79650..8867a309a 100644
--- a/include/staff/faq-categories.inc.php
+++ b/include/staff/faq-categories.inc.php
@@ -76,7 +76,7 @@ if($_REQUEST['q'] || $_REQUEST['cid'] || $_REQUEST['topicId']) { //Search.
)";
}
- $sql.=' GROUP BY faq.faq_id';
+ $sql.=' GROUP BY faq.faq_id ORDER BY question';
echo "<div><strong>Search Results</strong></div><div class='clear'></div>";
if(($res=db_query($sql)) && db_num_rows($res)) {
diff --git a/include/staff/faq-category.inc.php b/include/staff/faq-category.inc.php
index f12ed8ae8..5f22cb6f8 100644
--- a/include/staff/faq-category.inc.php
+++ b/include/staff/faq-category.inc.php
@@ -33,7 +33,7 @@ $sql='SELECT faq.faq_id, question, ispublished, count(attach.file_id) as attachm
.' FROM '.FAQ_TABLE.' faq '
.' LEFT JOIN '.FAQ_ATTACHMENT_TABLE.' attach ON(attach.faq_id=faq.faq_id) '
.' WHERE faq.category_id='.db_input($category->getId())
- .' GROUP BY faq.faq_id';
+ .' GROUP BY faq.faq_id ORDER BY question';
if(($res=db_query($sql)) && db_num_rows($res)) {
echo '<div id="faq">
<ol>';
--
GitLab