From 60fe9daeec659cb35b5d0609704df79dc3086ea3 Mon Sep 17 00:00:00 2001 From: "Duck (Jakob Munih)" Date: Tue, 3 Mar 2009 20:41:03 +0100 Subject: [PATCH] Fix get admin --- folks/lib/Report.php | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/folks/lib/Report.php b/folks/lib/Report.php index b080da886..61d495288 100644 --- a/folks/lib/Report.php +++ b/folks/lib/Report.php @@ -73,12 +73,14 @@ class Folks_Report { $name = $GLOBALS['registry']->getApp() . ':admin'; if ($GLOBALS['perms']->exists($name)) { - return array(); + $permission = $GLOBALS['perms']->getPermission($name); + if ($permission instanceof PEAR_Error) { + return $permission; + } + return $permission->getUserPermissions(PERM_DELETE); + } else { + return $GLOBALS['conf']['auth']['admins']; } - - $permission = $GLOBALS['perms']->getPermission($name); - - return $permission->getUserPermissions(PERM_DELETE); } /** -- 2.11.0