X-Git-Url: https://git.heureux-cyclage.org/?a=blobdiff_plain;f=includes%2FException.php;h=afa46ce2eacc65140598ed6f1a76505c6d18e7c2;hb=be8ce87825ae5d415fee2a1ee992184ed2f44a90;hp=5f808b2043c2a02b33d043c329c51fd881f182a9;hpb=fcd22b9a848f9b996c0057ff280e6a6b7f088da9;p=lhc%2Fweb%2Fwiklou.git diff --git a/includes/Exception.php b/includes/Exception.php index 5f808b2043..afa46ce2ea 100644 --- a/includes/Exception.php +++ b/includes/Exception.php @@ -1,21 +1,28 @@ isArticle() ) ) && + return $this->useMessageCache() && + !empty( $GLOBALS['wgFullyInitialised'] ) && + ( !empty( $GLOBALS['wgArticle'] ) || ( !empty( $GLOBALS['wgOut'] ) && !$GLOBALS['wgOut']->isArticleRelated() ) ) && !empty( $GLOBALS['wgTitle'] ); } @@ -25,32 +32,45 @@ class MWException extends Exception { */ function useMessageCache() { global $wgLang; - return is_object( $wgLang ); + + foreach ( $this->getTrace() as $frame ) { + if ( isset( $frame['class'] ) && $frame['class'] === 'LocalisationCache' ) { + return false; + } + } + + return $wgLang instanceof Language; } /** * Run hook to allow extensions to modify the text of the exception * - * @param String $name class name of the exception - * @param Array $args arguments to pass to the callback functions - * @return mixed string to output or null if any hook has been called + * @param $name String: class name of the exception + * @param $args Array: arguments to pass to the callback functions + * @return Mixed: string to output or null if any hook has been called */ function runHooks( $name, $args = array() ) { global $wgExceptionHooks; - if( !isset( $wgExceptionHooks ) || !is_array( $wgExceptionHooks ) ) + + if ( !isset( $wgExceptionHooks ) || !is_array( $wgExceptionHooks ) ) { return; // Just silently ignore - if( !array_key_exists( $name, $wgExceptionHooks ) || !is_array( $wgExceptionHooks[ $name ] ) ) + } + + if ( !array_key_exists( $name, $wgExceptionHooks ) || !is_array( $wgExceptionHooks[ $name ] ) ) { return; + } + $hooks = $wgExceptionHooks[ $name ]; $callargs = array_merge( array( $this ), $args ); - foreach( $hooks as $hook ) { - if( is_string( $hook ) || ( is_array( $hook ) && count( $hook ) >= 2 && is_string( $hook[0] ) ) ) { //'function' or array( 'class', hook' ) + foreach ( $hooks as $hook ) { + if ( is_string( $hook ) || ( is_array( $hook ) && count( $hook ) >= 2 && is_string( $hook[0] ) ) ) { // 'function' or array( 'class', hook' ) $result = call_user_func_array( $hook, $callargs ); } else { $result = null; } - if( is_string( $result ) ) + + if ( is_string( $result ) ) return $result; } } @@ -58,14 +78,15 @@ class MWException extends Exception { /** * Get a message from i18n * - * @param String $key message name - * @param String $fallback default message if the message cache can't be - * called by the exception + * @param $key String: message name + * @param $fallback String: default message if the message cache can't be + * called by the exception * The function also has other parameters that are arguments for the message * @return String message with arguments replaced */ function msg( $key, $fallback /*[, params...] */ ) { $args = array_slice( func_get_args(), 2 ); + if ( $this->useMessageCache() ) { return wfMsgReal( $key, $args ); } else { @@ -82,7 +103,8 @@ class MWException extends Exception { */ function getHTML() { global $wgShowExceptionDetails; - if( $wgShowExceptionDetails ) { + + if ( $wgShowExceptionDetails ) { return '
' . nl2br( htmlspecialchars( $this->getMessage() ) ) . '
Backtrace:
' . nl2br( htmlspecialchars( $this->getTraceAsString() ) ) . "
\n"; @@ -99,7 +121,8 @@ class MWException extends Exception { */ function getText() { global $wgShowExceptionDetails; - if( $wgShowExceptionDetails ) { + + if ( $wgShowExceptionDetails ) { return $this->getMessage() . "\nBacktrace:\n" . $this->getTraceAsString() . "\n"; } else { @@ -114,6 +137,7 @@ class MWException extends Exception { return wfMsg( 'internalerror' ); } else { global $wgSitename; + return "$wgSitename error"; } } @@ -122,13 +146,15 @@ class MWException extends Exception { * Return the requested URL and point to file and line number from which the * exception occured * - * @return string + * @return String */ function getLogMessage() { global $wgRequest; + $file = $this->getFile(); $line = $this->getLine(); $message = $this->getMessage(); + if ( isset( $wgRequest ) ) { $url = $wgRequest->getRequestURL(); if ( !$url ) { @@ -144,6 +170,7 @@ class MWException extends Exception { /** Output the exception report using HTML */ function reportHTML() { global $wgOut; + if ( $this->useOutputPage() ) { $wgOut->setPageTitle( $this->getPageTitle() ); $wgOut->setRobotPolicy( "noindex,nofollow" ); @@ -151,16 +178,21 @@ class MWException extends Exception { $wgOut->enableClientCache( false ); $wgOut->redirect( '' ); $wgOut->clearHTML(); - if( $hookResult = $this->runHooks( get_class( $this ) ) ) { + + $hookResult = $this->runHooks( get_class( $this ) ); + if ( $hookResult ) { $wgOut->addHTML( $hookResult ); } else { $wgOut->addHTML( $this->getHTML() ); } + $wgOut->output(); } else { - if( $hookResult = $this->runHooks( get_class( $this ) . "Raw" ) ) { + $hookResult = $this->runHooks( get_class( $this ) . "Raw" ); + if ( $hookResult ) { die( $hookResult ); } + if ( defined( 'MEDIAWIKI_INSTALL' ) || $this->htmlBodyOnly() ) { echo $this->getHTML(); } else { @@ -177,9 +209,11 @@ class MWException extends Exception { */ function report() { $log = $this->getLogMessage(); + if ( $log ) { wfDebugLog( 'exception', $log ); } + if ( self::isCommandLine() ) { wfPrintError( $this->getText() ); } else { @@ -192,32 +226,51 @@ class MWException extends Exception { * $wgOut to output the exception. */ function htmlHeader() { - global $wgLogo, $wgSitename, $wgOutputEncoding; + global $wgLogo, $wgOutputEncoding, $wgLang; if ( !headers_sent() ) { header( 'HTTP/1.0 500 Internal Server Error' ); - header( 'Content-type: text/html; charset='.$wgOutputEncoding ); + header( 'Content-type: text/html; charset=' . $wgOutputEncoding ); /* Don't cache error pages! They cause no end of trouble... */ header( 'Cache-control: none' ); header( 'Pragma: nocache' ); } - $title = $this->getPageTitle(); - echo " - -