Peter M. Groen / knowledgetree

Commit f23b3f07a2af749faff1b3a639ae49e85326fc27

Authored by kevin_fourie
1 parent e8fdad99

Merged in from STABLE trunk... 

KTC-17
"Quick links page faulty"
Fixed. Someone commented out the return for the TitleColumn.RenderData on which QuickLinksColumn is based.

Reviewed By: Kevin Fourie

KTC-20
"Fatal error on dashboard after deleting the target folder of a quick link and then navigating back to the dashboard"
Fixed.

Reviewed By: Conrad 


git-svn-id: https://kt-dms.svn.sourceforge.net/svnroot/kt-dms/STABLE/branches/3.3.3-Release-Branch@6357 c91229c3-7414-0410-bfa2-8a42b809f60b
Inline Side-by-side
Showing 2 changed files with 4 additions and 1 deletions
lib/browse/BrowseColumns.inc.php
  View file @f23b3f0
... ... @@ -142,7 +142,7 @@ class TitleColumn extends BrowseColumn {
142 142 $outStr .= ' (' . $this->prettySize($aDataRow['document']->getSize()) . ')';
143 143 $outStr .= '</span>';
144 144 }
145   - //return $outStr;
  145 + return $outStr;
146 146 }
147 147  
148 148 function prettySize($size) {
... ...
lib/permissions/permissionutil.inc.php
  View file @f23b3f0
... ... @@ -399,6 +399,9 @@ class KTPermissionUtil {
399 399 if (PEAR::isError($oPermission)) {
400 400 return false;
401 401 }
  402 + if (PEAR::isError($oFolderOrDocument) || $oFolderOrDocument == null) {
  403 + return false;
  404 + }
402 405 $oPL = KTPermissionLookup::get($oFolderOrDocument->getPermissionLookupID());
403 406 $oPLA = KTPermissionLookupAssignment::getByPermissionAndLookup($oPermission, $oPL);
404 407 if (PEAR::isError($oPLA)) {
... ...