From: Ben Klang <ben@alkaloid.net>
Date: Wed, 10 Mar 2010 20:19:55 +0000 (-0500)
Subject: Operator: Fix getting a handle on a Horde_Perms instance
X-Git-Url: https://git.internetallee.de/?a=commitdiff_plain;h=438fd1e05aa36c6dc7713c663da4d77f113162bc;p=horde.git

Operator: Fix getting a handle on a Horde_Perms instance
---

diff --git a/operator/lib/Driver.php b/operator/lib/Driver.php
index 0495ac919..5aee87099 100644
--- a/operator/lib/Driver.php
+++ b/operator/lib/Driver.php
@@ -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) ||