Operator: Fix getting a handle on a Horde_Perms instance
authorBen Klang <ben@alkaloid.net>
Wed, 10 Mar 2010 20:19:55 +0000 (15:19 -0500)
committerBen Klang <ben@alkaloid.net>
Wed, 10 Mar 2010 20:23:35 +0000 (15:23 -0500)
operator/lib/Driver.php

index 0495ac9..5aee870 100644 (file)
@@ -44,8 +44,8 @@ class Operator_Driver {
             $permentry = 'operator:accountcodes:' . $accountcode;
         }
 
+        $perms = $GLOBALS['injector']->getInstance('Horde_Perms');
         if (Horde_Auth::isAdmin() ||
-            $perms = $GLOBALS['injector']->getInstance('Horde_Perms');
             $perms->hasPermission('operator:accountcodes',
                                               Horde_Auth::getAuth(),
                                               Horde_Perms::READ) ||
@@ -81,8 +81,8 @@ class Operator_Driver {
         } else {
             $permentry = 'operator:accountcodes:' . $accountcode;
         }
+        $perms = $GLOBALS['injector']->getInstance('Horde_Perms');
         if (Horde_Auth::isAdmin() ||
-            $perms = $GLOBALS['injector']->getInstance('Horde_Perms');
             $perms->hasPermission('operator:accountcodes',
                                               Horde_Auth::getAuth(),
                                               Horde_Perms::READ) ||