remove unused message

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

diff --git a/includes/Hooks.php b/includes/Hooks.php
index b859af8..4daffaf 100644 (file)
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -1,6 +1,4 @@
 <?php
-if ( ! defined( 'MEDIAWIKI' ) )
-       die();
 /**
  * Hooks.php -- a tool for running hook functions
  * Copyright 2004, 2005 Evan Prodromou <evan@wikitravel.org>.
@@ -17,7 +15,7 @@ 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
@@ -25,50 +23,46 @@ if ( ! defined( 'MEDIAWIKI' ) )
  */
 
 
-/** 
+/**
  * Because programmers assign to $wgHooks, we need to be very
  * careful about its contents. So, there's a lot more error-checking
  * in here than would normally be necessary.
  */
 function wfRunHooks($event, $args = null) {
-       
+
        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;
        }
-       
+
        foreach ($wgHooks[$event] as $index => $hook) {
-               
+
                $object = NULL;
                $method = NULL;
                $func = NULL;
                $data = NULL;
                $have_data = false;
-               
+
                /* $hook can be: a function, an object, an array of $function and $data,
                 * an array of just a function, an array of object and method, or an
                 * array of object, method, and data.
                 */
-               
+
                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];
                                if (count($hook) < 2) {
@@ -87,7 +81,8 @@ 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;
@@ -95,18 +90,18 @@ function wfRunHooks($event, $args = null) {
                        $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. */
-               
+
                if ($have_data) {
                        $hook_args = array_merge(array($data), $args);
                } else {
                        $hook_args = $args;
                }
-               
-               
+
+
                if ( isset( $object ) ) {
                        $func = get_class( $object ) . '::' . $method;
                }
@@ -119,21 +114,18 @@ function wfRunHooks($event, $args = null) {
                        $retval = call_user_func_array($func, $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;
                } else if (!$retval) {
-                       wfProfileOut( $fname );
                        return false;
                }
        }
-       
-       wfProfileOut( $fname );
+
        return true;
 }
 ?>