From 45120a284f7cef4318c8346e5d893db2fe8ef7ae Mon Sep 17 00:00:00 2001 From: Megan Watson Date: Tue, 18 Dec 2007 06:15:26 +0000 Subject: [PATCH] KTC-286 "Welcome to knowledgeTree dashlet should always be on the top left corner of the dashlet container" Updated. Moved the sql ignore into an if not empty statement. --- lib/dashboard/dashletregistry.inc.php | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/lib/dashboard/dashletregistry.inc.php b/lib/dashboard/dashletregistry.inc.php index 8445ade..1bb18ee 100644 --- a/lib/dashboard/dashletregistry.inc.php +++ b/lib/dashboard/dashletregistry.inc.php @@ -66,10 +66,13 @@ class KTDashletRegistry { $sIgnore = (!empty($sInactive)) ? $sCurrent.','.$sInactive : $sCurrent; // Get all dashlets that haven't already been displayed to the user and are active for the user - $query = "SELECT * FROM plugin_helper h + $query = "SELECT h.classname, h.pathname, h.plugin FROM plugin_helper h INNER JOIN plugins p ON (h.plugin = p.namespace) - WHERE p.disabled = 0 AND classtype = 'dashlet' - AND h.classname NOT IN ($sIgnore)"; + WHERE p.disabled = 0 AND classtype = 'dashlet' "; + + if(!empty($sIgnore)){ + $query .= " AND h.classname NOT IN ($sIgnore)"; + } $res = DBUtil::getResultArray($query); -- libgit2 0.21.4