From f23b3f07a2af749faff1b3a639ae49e85326fc27 Mon Sep 17 00:00:00 2001
From: kevin_fourie <kevin_fourie@c91229c3-7414-0410-bfa2-8a42b809f60b>
Date: Fri, 2 Mar 2007 20:14:59 +0000
Subject: [PATCH] Merged in from STABLE trunk...

---
 lib/browse/BrowseColumns.inc.php       | 2 +-
 lib/permissions/permissionutil.inc.php | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/lib/browse/BrowseColumns.inc.php b/lib/browse/BrowseColumns.inc.php
index d942ad5..b0b6c36 100644
--- a/lib/browse/BrowseColumns.inc.php
+++ b/lib/browse/BrowseColumns.inc.php
@@ -142,7 +142,7 @@ class TitleColumn extends BrowseColumn {
            $outStr .= ' (' . $this->prettySize($aDataRow['document']->getSize()) . ')';
            $outStr .= '</span>';
         }
-        //return $outStr;
+        return $outStr;
     }
     
     function prettySize($size) {
diff --git a/lib/permissions/permissionutil.inc.php b/lib/permissions/permissionutil.inc.php
index 431c599..3ef6b77 100644
--- a/lib/permissions/permissionutil.inc.php
+++ b/lib/permissions/permissionutil.inc.php
@@ -399,6 +399,9 @@ class KTPermissionUtil {
         if (PEAR::isError($oPermission)) {
             return false;
         }
+        if (PEAR::isError($oFolderOrDocument) || $oFolderOrDocument == null) {
+            return false;
+        }
         $oPL = KTPermissionLookup::get($oFolderOrDocument->getPermissionLookupID());
         $oPLA = KTPermissionLookupAssignment::getByPermissionAndLookup($oPermission, $oPL);
         if (PEAR::isError($oPLA)) {
--
libgit2 0.21.4