* (bug 17408) Add $wgShowDebug configuration variable, displays debug data at the...

diff --git a/includes/DefaultSettings.php b/includes/DefaultSettings.php
index 2102b2a..949fd81 100644 (file)
--- a/includes/DefaultSettings.php
+++ b/includes/DefaultSettings.php
@@ -1038,6 +1038,13 @@ $wgDebugDumpSql         = false;
  */
 $wgDebugLogGroups       = array();
 
+/**
+ * Display debug data at the bottom of the main content area.
+ *
+ * Useful for developers and technical users trying to working on a closed wiki.
+ */
+$wgShowDebug            = false;
+
 /**
  * Show the contents of $wgHooks in Special:Version
  */

diff --git a/includes/Skin.php b/includes/Skin.php
index 66b2197..e326ed8 100644 (file)
--- a/includes/Skin.php
+++ b/includes/Skin.php
@@ -889,13 +889,28 @@ END;
                return $data;
        }
 
+       /**
+        * Generate debug data HTML for displaying at the bottom of the main content
+        * area.
+        * @return String HTML containing debug data, if enabled (otherwise empty).
+        */
+       protected function generateDebugHTML() {
+               global $wgShowDebug, $wgOut;
+               if ( $wgShowDebug ) {
+                       $listInternals = str_replace( "\n", "</li>\n<li>", htmlspecialchars( $wgOut->mDebugtext ) );
+                       return "\n<hr>\n<strong>Debug data:</strong><ul style=\"font-family:monospace;\"><li>" .
+                               $listInternals . "</li></ul>\n";
+               }
+               return '';
+       }
+
        /**
         * This gets called shortly before the </body> tag.
         * @return String HTML to be put before </body>
         */
        function afterContent() {
                $printfooter = "<div class=\"printfooter\">\n" . $this->printFooter() . "</div>\n";
-               return $printfooter . $this->doAfterContent();
+               return $this->generateDebugHTML() . $printfooter . $this->doAfterContent();
        }
 
        /**

diff --git a/includes/SkinTemplate.php b/includes/SkinTemplate.php
index 5959671..60b3eaa 100644 (file)
--- a/includes/SkinTemplate.php
+++ b/includes/SkinTemplate.php
@@ -401,7 +401,7 @@ class SkinTemplate extends Skin {
                $tpl->set( 'bottomscripts', $this->bottomScripts() );
 
                $printfooter = "<div class=\"printfooter\">\n" . $this->printSource() . "</div>\n";
-               $out->mBodytext .= $printfooter ;
+               $out->mBodytext .= $printfooter . $this->generateDebugHTML();
                $tpl->setRef( 'bodytext', $out->mBodytext );
 
                # Language links