CC-3590: Calendar GUI->DJ user should not be able to invoke "Add Show" window

-add user type into javascript as a variable so we can check permissions on js side
2012-04-20 11:31:24 -04:00 · 2012-04-20 11:31:24 -04:00 · da8a5296b0
commit da8a5296b0
parent 16f3a331bb
3 changed files with 18 additions and 4 deletions
--- a/airtime_mvc/application/models/User.php
+++ b/airtime_mvc/application/models/User.php
@ -295,7 +295,11 @@ class Application_Model_User {

    public static function GetCurrentUser() {
        $userinfo = Zend_Auth::getInstance()->getStorage()->read();
-
-        return new self($userinfo->id);
+        
+        if (is_null($userinfo)){
+            return null;
+        } else {
+            return new self($userinfo->id);
+        }
    }
 }