Changeset 9428 for plugins/sfDoctrineUserPlugin

Timestamp:

06/05/08 04:30:33 (5 years ago)

Author:

subzero2000

Message:

Fix to ensure sfContext actually has an instance by calling sfContext::hasInstance() prior to sfContext::getInstance().
symfony 1.1 throws an exception from within sfContext::getInstance() if the instance hasn't been instantiated yet, which is a change in behavior from symfony 1.0.
This fix is compatible with both symfony 1.0 and symfony 1.1.

Files:

• plugins/sfDoctrineUserPlugin/branches/1.0/lib/Template/Listener/Rankable.php (modified) (1 diff)
• plugins/sfDoctrineUserPlugin/branches/1.0/lib/Template/Listener/Userstampable.php (modified) (1 diff)

plugins/sfDoctrineUserPlugin/branches/1.0/lib/Template/Listener/Rankable.php

@@ -90 +90 @@
-    public function getCurrentUser()
-    {
- sfContext::getInstance()->getUser()->getUser() !== false) ? sfContext::getInstance()->getUser()->getUser() : null 
+sfContext::hasInstance() && sfContext::getInstance()->getUser()->getUser() !== false) ? sfContext::getInstance()->getUser()->getUser() : null
-    }
-}

plugins/sfDoctrineUserPlugin/branches/1.0/lib/Template/Listener/Userstampable.php

@@ -89 +89 @@
-    public function getCurrentUser()
-    {
-isset(sfContext::getInstance()->getUser()->getUser()->User
+(sfContext::hasInstance() && isset(sfContext::getInstance()->getUser()->getUser()->User)
-       return $user ;
-    }