Changeset 25577

Timestamp:

Nov 19, 2013, 4:41:05 PM (10 years ago)

Author:

mistic100

Message:

feature 2998: Warning: Parameter 3 to theme_activate() expected to be a reference, value given
unable to pass references through func_get_args and call_user_func_array

Location:

trunk/admin/include

Files:

• plugins.class.php (modified) (1 diff)
• themes.class.php (modified) (1 diff)

trunk/admin/include/plugins.class.php

@@ -30 +30 @@
   function install($plugin_version, &$errors=array())
   {
-    return $this->__call(__FUNCTION__, func_get_args());
+    if (is_callable('plugin_install'))
+    {
+      return plugin_install($this->plugin_id, $plugin_version, $errors);
+    }
   }
   function activate($plugin_version, &$errors=array())
   {
-    return $this->__call(__FUNCTION__, func_get_args());
+    if (is_callable('plugin_activate'))
+    {
+      return plugin_activate($this->plugin_id, $plugin_version, $errors);
+    }
   }
   function deactivate()
   {
-    return $this->__call(__FUNCTION__, func_get_args());
+    if (is_callable('plugin_install'))
+    {
+      return plugin_install($this->plugin_id);
+    }
   }
   function uninstall()
   {
-    return $this->__call(__FUNCTION__, func_get_args());
-  }
-
-  function __call($name, $arguments)
-  {
-    if (is_callable('plugin_'.$name))
-    {
-      array_unshift($arguments, $this->plugin_id);
-      return call_user_func_array('plugin_'.$name, $arguments);
-    }
-    return null;
+    if (is_callable('plugin_uninstall'))
+    {
+      return plugin_uninstall($this->plugin_id);
+    }
   }
 }

trunk/admin/include/themes.class.php

@@ -30 +30 @@
   function activate($theme_version, &$errors=array())
   {
-    return $this->__call(__FUNCTION__, func_get_args());
+    if (is_callable('theme_activate'))
+    {
+      return theme_activate($this->theme_id, $theme_version, $errors);
+    }
   }
   function deactivate()
   {
-    return $this->__call(__FUNCTION__, func_get_args());
+    if (is_callable('theme_deactivate'))
+    {
+      return theme_deactivate($this->theme_id);
+    }
   }
   function delete()
   {
-    return $this->__call(__FUNCTION__, func_get_args());
-  }
-
-  function __call($name, $arguments)
-  {
-    if (is_callable('theme_'.$name))
-    {
-      array_unshift($arguments, $this->theme_id);
-      return call_user_func_array('theme_'.$name, $arguments);
-    }
-    return null;
+    if (is_callable('theme_delete'))
+    {
+      return theme_delete($this->theme_id);
+    }
   }
 }