From d4efe7fa7b85b26881fbf7357caa2a2210f836b9 Mon Sep 17 00:00:00 2001 From: Tim Starling Date: Sun, 24 Sep 2006 06:04:58 +0000 Subject: [PATCH] Allow hooks to be static member functions --- includes/Hooks.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/includes/Hooks.php b/includes/Hooks.php index c00fbc1447..575a28c54c 100644 --- a/includes/Hooks.php +++ b/includes/Hooks.php @@ -101,18 +101,18 @@ function wfRunHooks($event, $args = null) { $hook_args = $args; } - if ( isset( $object ) ) { $func = get_class( $object ) . '::' . $method; + $callback = array( $object, $method ); + } elseif ( false !== ( $pos = strpos( '::', $func ) ) ) { + $callback = array( substr( $func, 0, $pos ), substr( $func, $pos + 2 ) ); + } else { + $callback = $func; } /* Call the hook. */ wfProfileIn( $func ); - if( isset( $object ) ) { - $retval = call_user_func_array(array($object, $method), $hook_args); - } else { - $retval = call_user_func_array($func, $hook_args); - } + $retval = call_user_func_array( $callback, $hook_args ); wfProfileOut( $func ); /* String return is an error; false return means stop processing. */ -- 2.20.1