From 5aa2339a1d7330b6d32e28b266caada1a679de60 Mon Sep 17 00:00:00 2001 From: Martin Konecny Date: Fri, 20 Apr 2012 13:11:28 -0400 Subject: [PATCH] CC-3693: Uninstalling + Reinstall of Airtime + refreshing the page as a non-existant user causes a stack trace. -Fixed --- airtime_mvc/application/models/User.php | 11 +++++++++-- 1 file changed, 9 insertions(+), 2 deletions(-) diff --git a/airtime_mvc/application/models/User.php b/airtime_mvc/application/models/User.php index 6d012f1ff..4a8fa8789 100644 --- a/airtime_mvc/application/models/User.php +++ b/airtime_mvc/application/models/User.php @@ -295,11 +295,18 @@ class Application_Model_User { public static function GetCurrentUser() { $userinfo = Zend_Auth::getInstance()->getStorage()->read(); - + if (is_null($userinfo)){ return null; } else { - return new self($userinfo->id); + try { + return new self($userinfo->id); + } catch (Exception $e){ + //we get here if $userinfo->id is defined, but doesn't exist + //in the database anymore. + Zend_Auth::getInstance()->clearIdentity(); + return null; + } } } }