From 7f3cfc862f0e802efbda485f9d77fdd5ec258396 Mon Sep 17 00:00:00 2001 From: nbm Date: Sat, 19 Nov 2005 22:09:55 +0000 Subject: [PATCH] BrowseQuery should only show live documents. --- lib/browse/PartialQuery.inc.php | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/lib/browse/PartialQuery.inc.php b/lib/browse/PartialQuery.inc.php index 829a2ff..9dbb671 100644 --- a/lib/browse/PartialQuery.inc.php +++ b/lib/browse/PartialQuery.inc.php @@ -65,7 +65,7 @@ class BrowseQuery extends PartialQuery{ function getDocumentCount() { // FIXME add permission checks here - $sQuery = "SELECT count(id) AS c FROM " . KTUtil::getTableName("documents") . " WHERE folder_id = ? "; + $sQuery = "SELECT count(id) AS c FROM " . KTUtil::getTableName("documents") . " WHERE folder_id = ? AND D.status_id = 1 "; $aParams = array($this->folder_id); return DBUtil::getOneResultKey(array($sQuery, $aParams), 'c'); // FIXME is this right? @@ -81,7 +81,9 @@ class BrowseQuery extends PartialQuery{ if ($sJoinClause !== null) { $sQuery .= $sJoinClause; - foreach ($aJoinParams as $param) { $aParams[] = $param; } // FIXME use merge... + foreach ($aJoinParams as $param) { + $aParams[] = $param; + } // FIXME use merge... } $sQuery .= " ORDER BY " . $sSortColumn . " " . $sSortOrder . " "; @@ -102,12 +104,14 @@ class BrowseQuery extends PartialQuery{ $aParams = array(); // main parameter array. $aJoinParams = array($aJoinParams); - $sQuery = "SELECT id FROM " . KTUtil::getTableName("documents") . " AS D WHERE folder_id = ? "; + $sQuery = "SELECT id FROM " . KTUtil::getTableName("documents") . " AS D WHERE folder_id = ? AND D.status_id = 1 "; $aParams = array($this->folder_id); if ($sJoinClause !== null) { $sQuery .= $sJoinClause; - foreach ($aJoinParams as $param) { $aParams[] = $param; } // FIXME use merge... + foreach ($aJoinParams as $param) { + $aParams[] = $param; + } // FIXME use merge... } $sQuery .= " ORDER BY " . $sSortColumn . " " . $sSortOrder . " "; @@ -211,4 +215,4 @@ class SimpleSearchQuery extends PartialQuery { } } -?> \ No newline at end of file +?> -- libgit2 0.21.4