cvs: pear /Benchmark Iterate.php /Forum/lib/plugins plugin.php /HTML_Template_IT ITX.php

sterling Wed Jan 1 12:57:53 2003 EDT Modified files: /pear/Benchmark Iterate.php /pear/Forum/lib/plugins plugin.php /pear/HTML_Template_IT ITX.php Log: Some more fixing up. Please test this... These functions aren't supposed to be used: (1) It encourages end-user usage (new message thread on php-general) (2) It throws ENOTICES (3) It is depreciated all necessary warnings apply Index: pear/Benchmark/Iterate.php diff -u pear/Benchmark/Iterate.php:1.5 pear/Benchmark/Iterate.php:1.6 --- pear/Benchmark/Iterate.php:1.5 Wed Jan 1 12:49:26 2003 +++ pear/Benchmark/Iterate.php Wed Jan 1 12:57:52 2003 @@ -12,7 +12,7 @@ // | license@php.net so we can mail you a copy immediately. | // +------------------------------------------------------------------------+ // -// $Id: Iterate.php,v 1.5 2003/01/01 17:49:26 sterling Exp $ +// $Id: Iterate.php,v 1.6 2003/01/01 17:57:52 sterling Exp $ // require_once 'Benchmark/Timer.php'; @@ -67,7 +67,7 @@ * $result = $benchmark->get(); * * @author Sebastian Bergmann <sb@sebastian-bergmann.de> -* @version $Revision: 1.5 $ +* @version $Revision: 1.6 $ * @access public */ @@ -89,7 +89,7 @@ $objectmethod = $function_name[1]; } - // If we're calling a method on an object use call_user_method + // If we're calling a method on an object use call_user_func if (strstr($function_name, '->')) { $function_name = explode('->', $function_name); $objectname = $function_name[0]; Index: pear/Forum/lib/plugins/plugin.php diff -u pear/Forum/lib/plugins/plugin.php:1.5 pear/Forum/lib/plugins/plugin.php:1.6 --- pear/Forum/lib/plugins/plugin.php:1.5 Sat Oct 27 08:12:29 2001 +++ pear/Forum/lib/plugins/plugin.php Wed Jan 1 12:57:52 2003 @@ -15,7 +15,7 @@ if(method_exists($plugin, $hook)) { /* Two ways to call plugins */ - call_user_method($hook, $plugin, $param); + call_user_func(array(&$plugin, $hook), $param); // $plugin->$hook(&$param); } } Index: pear/HTML_Template_IT/ITX.php diff -u pear/HTML_Template_IT/ITX.php:1.6 pear/HTML_Template_IT/ITX.php:1.7 --- pear/HTML_Template_IT/ITX.php:1.6 Sat Aug 31 18:15:55 2002 +++ pear/HTML_Template_IT/ITX.php Wed Jan 1 12:57:53 2003 @@ -16,7 +16,7 @@ // | Author: Ulf Wendel <ulf.wendel@phpdoc.de> | // +----------------------------------------------------------------------+ // -// $Id: ITX.php,v 1.6 2002/08/31 22:15:55 pajoye Exp $ +// $Id: ITX.php,v 1.7 2003/01/01 17:57:53 sterling Exp $ // require_once('HTML/Template/IT.php'); @@ -35,7 +35,7 @@ * * @author Ulf Wendel <uw@netuse.de> * @access public -* @version $Id: ITX.php,v 1.6 2002/08/31 22:15:55 pajoye Exp $ +* @version $Id: ITX.php,v 1.7 2003/01/01 17:57:53 sterling Exp $ * @package IT[X] */ class HTML_Template_ITX extends HTML_Template_IT { @@ -383,9 +383,9 @@ if (isset($this->callback[$function['name']])) { if ('' != $this->callback[$function['name']]['object']) { - $this->variableCache['__function' . $func_id . '__'] = call_user_method( - $this->callback[$function['name']]['function'], - $GLOBALS[$this->callback[$function['name']]['object']], + $this->variableCache['__function' . $func_id . '__'] = call_user_func( + array(&$GLOBALS[$this->callback[$function['name']]['object']], + $this->callback[$function['name']]['function']), $function['args'] ); } else { @@ -758,4 +758,4 @@ } // end func warning } // end class HTML_Template_ITX -?> \ No newline at end of file +?>