From 7e995c96f770e96b1847aa676e35651689f46e4c Mon Sep 17 00:00:00 2001 From: Alexandre Emsenhuber Date: Sun, 3 Oct 2010 08:42:38 +0000 Subject: [PATCH] Added wfDeprecated() to wfAbruptExit() and wfErrorExit() and removed a comment that mentioned it --- includes/Exception.php | 2 +- includes/GlobalFunctions.php | 2 ++ 2 files changed, 3 insertions(+), 1 deletion(-) diff --git a/includes/Exception.php b/includes/Exception.php index 22443624fd..a5e86cdc05 100644 --- a/includes/Exception.php +++ b/includes/Exception.php @@ -388,7 +388,7 @@ function wfExceptionHandler( $e ) { wfReportException( $e ); - // Final cleanup, similar to wfErrorExit() + // Final cleanup if ( $wgFullyInitialised ) { try { wfLogProfilingData(); // uses $wgRequest, hence the $wgFullyInitialised condition diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php index fc793b92b4..3b1c0be0ce 100644 --- a/includes/GlobalFunctions.php +++ b/includes/GlobalFunctions.php @@ -937,6 +937,7 @@ function wfAbruptExit( $error = false ) { } $called = true; + wfDeprecated( __FUNCTION__ ); $bt = wfDebugBacktrace(); if( $bt ) { for( $i = 0; $i < count( $bt ); $i++ ) { @@ -960,6 +961,7 @@ function wfAbruptExit( $error = false ) { * @deprecated Please return control the caller or throw an exception */ function wfErrorExit() { + wfDeprecated( __FUNCTION__ ); wfAbruptExit( true ); } -- 2.20.1