Author: Jonathan.Wage
Date: 2010-01-19 20:14:32 +0100 (Tue, 19 Jan 2010)
New Revision: 26898

Modified:
   
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/model/doctrine/PluginsfSympalMenuItem.class.php
   plugins/sfSympalPlugin/trunk/lib/sfSympalContext.php
Log:
[1.4][sfSympalPlugin][1.0] Fixing issue with previous commit


Modified: 
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/model/doctrine/PluginsfSympalMenuItem.class.php
===================================================================
--- 
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/model/doctrine/PluginsfSympalMenuItem.class.php
     2010-01-19 19:07:52 UTC (rev 26897)
+++ 
plugins/sfSympalPlugin/trunk/lib/plugins/sfSympalMenuPlugin/lib/model/doctrine/PluginsfSympalMenuItem.class.php
     2010-01-19 19:14:32 UTC (rev 26898)
@@ -27,9 +27,22 @@
 
   public function postSave($event)
   {
-    return $this->getMenu()->clearCache();
+    if (sfSympalContext::hasInstance())
+    {
+      return $this->clearMenuCache();
+    }
   }
 
+  public function clearMenuCache()
+  {
+    if ($menu = $this->getMenu())
+    {
+      return $menu->clearCache();
+    } else {
+      return false;
+    }
+  }
+
   public function getParentId()
   {
     $node = $this->getNode();

Modified: plugins/sfSympalPlugin/trunk/lib/sfSympalContext.php
===================================================================
--- plugins/sfSympalPlugin/trunk/lib/sfSympalContext.php        2010-01-19 
19:07:52 UTC (rev 26897)
+++ plugins/sfSympalPlugin/trunk/lib/sfSympalContext.php        2010-01-19 
19:14:32 UTC (rev 26898)
@@ -178,6 +178,11 @@
     return self::$_instances[$site];
   }
 
+  public static function hasInstance($site = null)
+  {
+    return is_null($site) ? !empty(self::$_instances) : 
isset(self::$_instances[$site]);
+  }
+
   public static function createInstance(sfContext $symfonyContext, 
sfSympalConfiguration $sympalConfiguration)
   {
     $site = $symfonyContext->getConfiguration()->getApplication();

-- 
You received this message because you are subscribed to the Google Groups 
"symfony SVN" group.
To post to this group, send email to [email protected].
To unsubscribe from this group, send email to 
[email protected].
For more options, visit this group at 
http://groups.google.com/group/symfony-svn?hl=en.


Reply via email to