FIX:MANAGER::instance()をstaticに

[nucleus-jp/nucleus-next.git] / nucleus / libs / MANAGER.php

diff --git a/nucleus/libs/MANAGER.php b/nucleus/libs/MANAGER.php
index 1fc1c65..ea9a5ad 100644 (file)
--- a/nucleus/libs/MANAGER.php
+++ b/nucleus/libs/MANAGER.php
@@ -20,7 +20,7 @@
  *\r
  * @license http://nucleuscms.org/license.txt GNU General Public License\r
  * @copyright Copyright (C) 2002-2009 The Nucleus Group\r
- * @version $Id: MANAGER.php 1731 2012-04-08 15:10:35Z sakamocchi $\r
+ * @version $Id: MANAGER.php 1878 2012-06-17 07:42:07Z sakamocchi $\r
  */\r
 class Manager\r
 {\r
@@ -72,7 +72,7 @@ class Manager
         * $manager =& Manager::instance(); to get a reference to the object\r
         * instead of a copy\r
         */\r
-       public function &instance()\r
+       public static function &instance()\r
        {\r
                static $instance = array();\r
                if ( empty($instance) )\r
@@ -95,6 +95,7 @@ class Manager
                $this->skins = array();\r
                $this->parserPrefs = array();\r
                $this->cachedInfo = array();\r
+               $this->members = array();\r
                return;\r
        }\r
        \r
@@ -569,7 +570,7 @@ class Manager
                                  && !empty($this->plugins[$listener])\r
                                  && method_exists($this->plugins[$listener], 'event_' . $eventName) )\r
                                {\r
-                                       call_user_func(array(&$this->plugins[$listener],'event_' . $eventName), $data);\r
+                                       call_user_func(array(&$this->plugins[$listener], 'event_' . $eventName), array(&$data));\r
                                }\r
                        }\r
                }\r