Fixed $wgDebugComments

diff --git a/includes/GlobalFunctions.php b/includes/GlobalFunctions.php
index 090d965..dc299f6 100644 (file)
--- a/includes/GlobalFunctions.php
+++ b/includes/GlobalFunctions.php
@@ -190,13 +190,25 @@ function wfUrlencode ( $s ) {
  */
 function wfDebug( $text, $logonly = false ) {
        global $wgOut, $wgDebugLogFile, $wgDebugComments, $wgProfileOnly, $wgDebugRawPage;
+       static $recursion = 0;
 
        # Check for raw action using $_GET not $wgRequest, since the latter might not be initialised yet
        if ( isset( $_GET['action'] ) && $_GET['action'] == 'raw' && !$wgDebugRawPage ) {
                return;
        }
 
-       if ( isset( $wgOut ) && $wgDebugComments && !$logonly ) {
+       if ( $wgDebugComments && !$logonly ) {
+               if ( !isset( $wgOut ) ) {
+                       return;
+               }
+               if ( !StubObject::isRealObject( $wgOut ) ) {
+                       if ( $recursion ) {
+                               return;
+                       }
+                       $recursion++;
+                       $wgOut->_unstub();
+                       $recursion--;
+               }
                $wgOut->debug( $text );
        }
        if ( '' != $wgDebugLogFile && !$wgProfileOnly ) {

diff --git a/skins/MonoBook.php b/skins/MonoBook.php
index 81e9236..6063b39 100644 (file)
--- a/skins/MonoBook.php
+++ b/skins/MonoBook.php
@@ -269,7 +269,12 @@ class MonoBookTemplate extends QuickTemplate {
        <?php $this->html('bottomscripts'); /* JS call to runBodyOnloadHook */ ?>
 </div>
 <?php $this->html('reporttime') ?>
+<?php if ( $this->data['debug'] ): ?>
+<!-- Debug output:
+<?php $this->text( 'debug' ); ?>
 
+-->
+<?php endif; ?>
 </body></html>
 <?php
        wfRestoreWarnings();