From: Andrew Garrett Date: Wed, 1 Jul 2009 17:48:30 +0000 (+0000) Subject: Revert unintended core changes in r52627 X-Git-Tag: 1.31.0-rc.0~41150 X-Git-Url: http://git.cyclocoop.org/data/%24self?a=commitdiff_plain;h=160936a8ddb991d4f9c6668e42b0fa025e3b1ff7;p=lhc%2Fweb%2Fwiklou.git Revert unintended core changes in r52627 --- diff --git a/includes/Exception.php b/includes/Exception.php index 7e5f0671e2..b2d668c804 100644 --- a/includes/Exception.php +++ b/includes/Exception.php @@ -26,8 +26,7 @@ class MWException extends Exception { function useMessageCache() { global $wgLang; foreach ( $this->getTrace() as $frame ) { - if ( isset( $frame['class'] ) && - $frame['class'] == 'LocalisationCache' ) { + if ( $frame['class'] == 'LocalisationCache' ) { return false; } } diff --git a/includes/Skin.php b/includes/Skin.php index bd1d40e9ff..6ff984b177 100644 --- a/includes/Skin.php +++ b/includes/Skin.php @@ -290,35 +290,6 @@ class Skin extends Linker { public function getTitle() { return $this->mTitle; } - - function outputUnwrappedText( $out ) { - global $wgDebugComments; - wfProfileIn( __METHOD__ ); - - $this->setMembers(); - $this->initPage( $out ); - - $out->out( $out->headElement( $this ) ); - - $out->out( "\ngetBodyOptions(); - foreach ( $ops as $name => $val ) { - $out->out( " $name='$val'" ); - } - $out->out( ">\n" ); - if ( $wgDebugComments ) { - $out->out( "\n" ); - } - - $out->out( $out->mBodytext . "\n" ); - $out->out( $this->bottomScripts() ); - - $out->out( wfReportTime() ); - - $out->out( "\n" ); - wfProfileOut( __METHOD__ ); - } function outputPage( OutputPage $out ) { global $wgDebugComments;