* (bug 20388) ProfilerSimpleText no longer outputs comments on action=raw so that...

Todo: maybe output /* */ comment when generating CSS/JS, but it'd need to factorise some code in RawPage (or another way)

diff --git a/RELEASE-NOTES b/RELEASE-NOTES
index 65a0d14..04db739 100644 (file)
--- a/RELEASE-NOTES
+++ b/RELEASE-NOTES
@@ -687,6 +687,7 @@ it from source control: http://www.mediawiki.org/wiki/Download_from_SVN
 * (bug 21536) Fixed JavaScript error on Special:Search caused by an incorrect ID
 * (bug 21535) RecentChanges RSS feed now always recognises the namespace filter,
   previously it sometimes didn't due to caching.
+* (bug 20388) ProfilerSimpleText no longer outputs comment on action=raw
 
 == API changes in 1.16 ==
 

diff --git a/includes/ProfilerSimpleText.php b/includes/ProfilerSimpleText.php
index 9252e30..d3df390 100644 (file)
--- a/includes/ProfilerSimpleText.php
+++ b/includes/ProfilerSimpleText.php
@@ -21,6 +21,10 @@ class ProfilerSimpleText extends ProfilerSimple {
        public $visible=false; /* Show as <PRE> or <!-- ? */
 
        function getFunctionReport() {
+               global $wgRequest;
+               if ( $wgRequest->getVal( 'action' ) == 'raw' ) # bug 20388
+                       return;
+
                if ($this->visible) print "<pre>";
                        else print "<!--\n";
                uasort($this->mCollated,array('self','sort'));