mirror/php-e107
1
0
Fork 0
mirror of https://github.com/e107inc/e107.git synced 2025-08-04 13:47:31 +02:00
Code Issues Releases Wiki Activity

Plugin handler - execute_function supports callback data now; current and required version number now sent to the upgrade_required method (plugin setup file)

Browse Source
This commit is contained in:
SecretR
2013-02-08 09:15:57 +02:00
parent 967903510d
commit 61ed8355f7
2 changed files with 5 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
e107_handlers/e107_class.php
View File

@@ -1424,7 +1424,7 @@ class e107
/** /**
* Retrieve plugin handler singleton object * Retrieve plugin handler singleton object
* @return e_ranks * @return e107plugin
*/ */
public static function getPlugin() public static function getPlugin()
{ {

6
e107_handlers/plugin_class.php
View File

@@ -182,7 +182,7 @@ class e107plugin
$curVal = floatval($version); $curVal = floatval($version);
$fileVal = floatval($data['@attributes']['version']); $fileVal = floatval($data['@attributes']['version']);
if($ret = $this->execute_function($path, 'upgrade', 'required')) // Check {plugin}_setup.php and run a 'required' method, if true, then update is required. if($ret = $this->execute_function($path, 'upgrade', 'required', array($this, $curVal, $fileVal))) // Check {plugin}_setup.php and run a 'required' method, if true, then update is required.
{ {
if($mode == 'boolean') if($mode == 'boolean')
{ {
@@ -2109,9 +2109,10 @@ class e107plugin
* @param object $path [unused] * @param object $path [unused]
* @param object $what install|uninstall|upgrade * @param object $what install|uninstall|upgrade
* @param object $when pre|post * @param object $when pre|post
* @param array $callbackData callback method arguments
* @return boolean FALSE * @return boolean FALSE
*/ */
function execute_function($path = null, $what = '', $when = '') function execute_function($path = null, $what = '', $when = '', $callbackData = null)
{ {
$mes = eMessage::getInstance(); $mes = eMessage::getInstance();
@@ -2157,6 +2158,7 @@ class e107plugin
{ {
$mes->add("Executing setup function <b>".$class_name." :: ".$method_name."()</b>", E_MESSAGE_DEBUG); $mes->add("Executing setup function <b>".$class_name." :: ".$method_name."()</b>", E_MESSAGE_DEBUG);
} }
if(null !== $callbackData) return call_user_func_array(array($obj, $method_name), $callbackData);
return call_user_func(array($obj, $method_name), $this); return call_user_func(array($obj, $method_name), $this);
} }
else else