* (bug 3684) Fix typo in fatal error backtraces in Hooks.php

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 9fcca3d..376dd1e 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -145,6 +145,8 @@ fully support the editing toolbar, but was found to be too confusing.
 * Namespaces hacks on LanguagePl
 * New preferences design and reorganisation
 * (bug 2585) Return proper 404 code when pages don't exist
+* (bug 3684) Fix typo in fatal error backtraces in Hooks.php
+
 
 === Caveats ===
 

diff --git a/includes/Hooks.php b/includes/Hooks.php
index 3c12332..d5aa87d 100644 (file)
--- a/includes/Hooks.php
+++ b/includes/Hooks.php
@@ -37,7 +37,7 @@ if (defined('MEDIAWIKI')) {
                wfProfileIn( $fname );
 
                if (!is_array($wgHooks)) {
-                       wfDieDebugBacktrace("Global hooks array is not an array!\n");
+                       wfDebugDieBacktrace("Global hooks array is not an array!\n");
                        wfProfileOut( $fname );
                        return false;
                }
@@ -48,7 +48,7 @@ if (defined('MEDIAWIKI')) {
                }
                
                if (!is_array($wgHooks[$event])) {
-                       wfDieDebugBacktrace("Hooks array for event '$event' is not an array!\n");
+                       wfDebugDieBacktrace("Hooks array for event '$event' is not an array!\n");
                        wfProfileOut( $fname );
                        return false;
                }
@@ -68,7 +68,7 @@ if (defined('MEDIAWIKI')) {
                        
                        if (is_array($hook)) {
                                if (count($hook) < 1) {
-                                       wfDieDebugBacktrace("Empty array in hooks for " . $event . "\n");
+                                       wfDebugDieBacktrace("Empty array in hooks for " . $event . "\n");
                                } else if (is_object($hook[0])) {
                                        $object = $hook[0];
                                        if (count($hook) < 2) {
@@ -87,7 +87,7 @@ if (defined('MEDIAWIKI')) {
                                                $have_data = true;
                                        }
                                } else {
-                                       wfDieDebugBacktrace("Unknown datatype in hooks for " . $event . "\n");
+                                       wfDebugDieBacktrace("Unknown datatype in hooks for " . $event . "\n");
                                }
                        } else if (is_string($hook)) { # functions look like strings, too
                                $func = $hook;
@@ -95,7 +95,7 @@ if (defined('MEDIAWIKI')) {
                                $object = $hook;
                                $method = "on" . $event;
                        } else {
-                               wfDieDebugBacktrace("Unknown datatype in hooks for " . $event . "\n");
+                               wfDebugDieBacktrace("Unknown datatype in hooks for " . $event . "\n");
                        }
                        
                        /* We put the first data element on, if needed. */