Handle multiple warnings correctly in ApiBase::setWarning(). Calling this function...

[lhc/web/wiklou.git] / includes / Hooks.php

diff --git a/includes/Hooks.php b/includes/Hooks.php
index 6485773..046a149 100644 (file)
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -1,6 +1,4 @@
 <?php
-if ( ! defined( 'MEDIAWIKI' ) )
-       die( -1 );
 /**
  * Hooks.php -- a tool for running hook functions
  * Copyright 2004, 2005 Evan Prodromou <evan@wikitravel.org>.
@@ -17,11 +15,11 @@ if ( ! defined( 'MEDIAWIKI' ) )
  *
  *  You should have received a copy of the GNU General Public License
  *  along with this program; if not, write to the Free Software
- *  Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
+ *  Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA
  *
  * @author Evan Prodromou <evan@wikitravel.org>
- * @package MediaWiki
  * @see hooks.txt
+ * @file
  */
 
 
@@ -30,26 +28,21 @@ if ( ! defined( 'MEDIAWIKI' ) )
  * careful about its contents. So, there's a lot more error-checking
  * in here than would normally be necessary.
  */
-function wfRunHooks($event, $args = null) {
+function wfRunHooks($event, $args = array()) {
 
        global $wgHooks;
-       $fname = 'wfRunHooks';
-       wfProfileIn( $fname );
 
        if (!is_array($wgHooks)) {
-               wfDebugDieBacktrace("Global hooks array is not an array!\n");
-               wfProfileOut( $fname );
+               throw new MWException("Global hooks array is not an array!\n");
                return false;
        }
 
        if (!array_key_exists($event, $wgHooks)) {
-               wfProfileOut( $fname );
                return true;
        }
 
        if (!is_array($wgHooks[$event])) {
-               wfDebugDieBacktrace("Hooks array for event '$event' is not an array!\n");
-               wfProfileOut( $fname );
+               throw new MWException("Hooks array for event '$event' is not an array!\n");
                return false;
        }
 
@@ -68,9 +61,9 @@ function wfRunHooks($event, $args = null) {
 
                if (is_array($hook)) {
                        if (count($hook) < 1) {
-                               wfDebugDieBacktrace("Empty array in hooks for " . $event . "\n");
+                               throw new MWException("Empty array in hooks for " . $event . "\n");
                        } else if (is_object($hook[0])) {
-                               $object =& $wgHooks[$event][$index][0];
+                               $object = $wgHooks[$event][$index][0];
                                if (count($hook) < 2) {
                                        $method = "on" . $event;
                                } else {
@@ -87,15 +80,16 @@ function wfRunHooks($event, $args = null) {
                                        $have_data = true;
                                }
                        } else {
-                               wfDebugDieBacktrace("Unknown datatype in hooks for " . $event . "\n");
+                               var_dump( $wgHooks );
+                               throw new MWException("Unknown datatype in hooks for " . $event . "\n");
                        }
                } else if (is_string($hook)) { # functions look like strings, too
                        $func = $hook;
                } else if (is_object($hook)) {
-                       $object =& $wgHooks[$event][$index];
+                       $object = $wgHooks[$event][$index];
                        $method = "on" . $event;
                } else {
-                       wfDebugDieBacktrace("Unknown datatype in hooks for " . $event . "\n");
+                       throw new MWException("Unknown datatype in hooks for " . $event . "\n");
                }
 
                /* We put the first data element on, if needed. */
@@ -106,34 +100,47 @@ 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;
                }
 
+               // Run autoloader (workaround for call_user_func_array bug)
+               is_callable( $callback );
+
                /* 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. */
 
                if (is_string($retval)) {
                        global $wgOut;
-                       $wgOut->fatalError($retval);
-                       wfProfileOut( $fname );
+                       $wgOut->showFatalError($retval);
                        return false;
+               } elseif( $retval === null ) {
+                       if( is_array( $callback ) ) {
+                               if( is_object( $callback[0] ) ) {
+                                       $prettyClass = get_class( $callback[0] );
+                               } else {
+                                       $prettyClass = strval( $callback[0] );
+                               }
+                               $prettyFunc = $prettyClass . '::' . strval( $callback[1] );
+                       } else {
+                               $prettyFunc = strval( $callback );
+                       }
+                       throw new MWException( "Detected bug in an extension! " .
+                               "Hook $prettyFunc failed to return a value; " .
+                               "should return true to continue hook processing or false to abort." );
                } else if (!$retval) {
-                       wfProfileOut( $fname );
                        return false;
                }
        }
 
-       wfProfileOut( $fname );
        return true;
 }
-?>