Peter M. Groen / knowledgetree

Commit 0c82a14339497c532d49349bbf0c257cc4028cc4

Authored by kevin_fourie
1 parent 96019e04

Merged in... 

KTS-3773
"Searching for folders or documents where shortcuts are available shows a duplicate entry for the shortcut."
Fixed.

Committed By: Conrad Vermeulen
Reviewed By: Megan Watson


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.5.4-Release-Branch@9447 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 6 additions and 1 deletions
search2/search/expr.inc.php
  View file @0c82a14
... ... @@ -1289,8 +1289,13 @@ class SQLQueryBuilder implements QueryBuilder
1289 1289  
1290 1290 if ($this->context == ExprContext::DOCUMENT)
1291 1291 {
1292   - $sql .= "dmv.status_id=1 AND d.status_id=1 AND \n ";
  1292 + $sql .= "dmv.status_id=1 AND d.status_id=1 AND d.linked_document_id is null";
1293 1293 }
  1294 + else
  1295 + {
  1296 + $sql .= "f.linked_folder_id is null";
  1297 + }
  1298 + $sql .= ' AND ';
1294 1299 return $sql;
1295 1300 }
1296 1301  
... ...