Changeset 11257

Timestamp:

Apr 9, 2009, 5:40:46 PM (13 years ago)

Author:

ShogoKawahara

Message:

#3754:fixed opPlugin doesn't migrate correctly

Location:

OpenPNE3/trunk/lib

Files:

• migration/opMigration.class.php (modified) (1 diff)
• plugin/opPlugin.class.php (modified) (3 diffs)

OpenPNE3/trunk/lib/migration/opMigration.class.php

@@ -106 +106 @@
     {
       $this->targetName = $name;
-      $this->pluginInstance = opPlugin::getInstance($this->targetName);
+      $this->pluginInstance = opPlugin::getInstance($this->targetName, $this->dispatcher);
     }
     else

OpenPNE3/trunk/lib/plugin/opPlugin.class.php

@@ -26 +26 @@
     $summary;
 
-  private function __construct($pluginName)
+  private function __construct($pluginName, sfEventDispatcher $dispatcher)
   {
     $this->name = $pluginName;
@@ -44 +44 @@
     else
     {
-      $manager = new opPluginManager(sfContext::getInstance()->getEventDispatcher());
+      $manager = new opPluginManager($dispatcher);
       $package = $manager->getEnvironment()->getRegistry()->getPackage($pluginName, opPluginManager::OPENPNE_PLUGIN_CHANNEL);
       if ($package)
@@ -54 +54 @@
   }
 
-  public static function getInstance($pluginName)
+  public static function getInstance($pluginName, sfEventDispatcher $dispatcher = null)
   {
+    if (is_null($dispatcher))
+    {
+      $dispatcher = sfContext::getInstance()->getEventDispatcher();
+    }
+
     if (empty(self::$instances[$pluginName]))
     {
-      self::$instances[$pluginName] = new opPlugin($pluginName);
+      self::$instances[$pluginName] = new opPlugin($pluginName, $dispatcher);
     }