Peter M. Groen / knowledgetree

Commit 3e8703c1b2f6ce2a43ce9dc2076220342ee3aea7

Authored by nbm
1 parent d56c5c86

KTS-622: don't show a folder as orphaned if it is in the root folder. 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/trunk@5193 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 1 changed file with 1 additions and 1 deletions
lib/browse/browseutil.inc.php
  View file @3e8703c
@@ -304,7 +304,6 @@ class KTBrowseUtil { @@ -304,7 +304,6 @@ class KTBrowseUtil {
304 $aPermissionDescriptors = KTPermissionUtil::getPermissionDescriptorsForUser($oUser); 304 $aPermissionDescriptors = KTPermissionUtil::getPermissionDescriptorsForUser($oUser);
305 305
306 306
307 -  
308 if (empty($aPermissionDescriptors)) { 307 if (empty($aPermissionDescriptors)) {
309 return array(); 308 return array();
310 } 309 }
@@ -321,6 +320,7 @@ class KTBrowseUtil { @@ -321,6 +320,7 @@ class KTBrowseUtil {
321 LEFT JOIN $sPLTable AS PL2 ON F2.permission_lookup_id = PL2.id LEFT JOIN $sPLATable AS PLA2 ON PLA2.permission_lookup_id = PL2.id AND PLA2.permission_id = ? 320 LEFT JOIN $sPLTable AS PL2 ON F2.permission_lookup_id = PL2.id LEFT JOIN $sPLATable AS PLA2 ON PLA2.permission_lookup_id = PL2.id AND PLA2.permission_id = ?
322 WHERE 321 WHERE
323 PLA.permission_descriptor_id IN ($sPermissionDescriptors) 322 PLA.permission_descriptor_id IN ($sPermissionDescriptors)
  323 + AND F2.id != 1
324 AND NOT (PLA2.permission_descriptor_id IN ($sPermissionDescriptors))"; 324 AND NOT (PLA2.permission_descriptor_id IN ($sPermissionDescriptors))";
325 $aParams = kt_array_merge(array($oPermission->getId(), $oPermission->getId()), $aPermissionDescriptors, $aPermissionDescriptors); 325 $aParams = kt_array_merge(array($oPermission->getId(), $oPermission->getId()), $aPermissionDescriptors, $aPermissionDescriptors);
326 $res = DBUtil::getResultArrayKey(array($sQuery, $aParams), 'id'); 326 $res = DBUtil::getResultArrayKey(array($sQuery, $aParams), 'id');