| Index: trunk/phase3/includes/Skin.php |
| — | — | @@ -290,36 +290,7 @@ |
| 291 | 291 | public function getTitle() { |
| 292 | 292 | return $this->mTitle; |
| 293 | 293 | } |
| 294 | | - |
| 295 | | - function outputUnwrappedText( $out ) { |
| 296 | | - global $wgDebugComments; |
| 297 | | - wfProfileIn( __METHOD__ ); |
| 298 | 294 | |
| 299 | | - $this->setMembers(); |
| 300 | | - $this->initPage( $out ); |
| 301 | | - |
| 302 | | - $out->out( $out->headElement( $this ) ); |
| 303 | | - |
| 304 | | - $out->out( "\n<body" ); |
| 305 | | - $ops = $this->getBodyOptions(); |
| 306 | | - foreach ( $ops as $name => $val ) { |
| 307 | | - $out->out( " $name='$val'" ); |
| 308 | | - } |
| 309 | | - $out->out( ">\n" ); |
| 310 | | - if ( $wgDebugComments ) { |
| 311 | | - $out->out( "<!-- Wiki debugging output:\n" . |
| 312 | | - $out->mDebugtext . "-->\n" ); |
| 313 | | - } |
| 314 | | - |
| 315 | | - $out->out( $out->mBodytext . "\n" ); |
| 316 | | - $out->out( $this->bottomScripts() ); |
| 317 | | - |
| 318 | | - $out->out( wfReportTime() ); |
| 319 | | - |
| 320 | | - $out->out( "\n</body></html>" ); |
| 321 | | - wfProfileOut( __METHOD__ ); |
| 322 | | - } |
| 323 | | - |
| 324 | 295 | function outputPage( OutputPage $out ) { |
| 325 | 296 | global $wgDebugComments; |
| 326 | 297 | wfProfileIn( __METHOD__ ); |
| Index: trunk/phase3/includes/Exception.php |
| — | — | @@ -26,8 +26,7 @@ |
| 27 | 27 | function useMessageCache() { |
| 28 | 28 | global $wgLang; |
| 29 | 29 | foreach ( $this->getTrace() as $frame ) { |
| 30 | | - if ( isset( $frame['class'] ) && |
| 31 | | - $frame['class'] == 'LocalisationCache' ) { |
| | 30 | + if ( $frame['class'] == 'LocalisationCache' ) { |
| 32 | 31 | return false; |
| 33 | 32 | } |
| 34 | 33 | } |