Revert the fix for bug 32858 (r105664, r105161, r103476): no consensus, backwards...

diff --git a/RELEASE-NOTES-1.19 b/RELEASE-NOTES-1.19
index 72cefb8..6ea996f 100644 (file)
--- a/RELEASE-NOTES-1.19
+++ b/RELEASE-NOTES-1.19
@@ -163,8 +163,6 @@ production.
 * (bug 32168) Add wfAssembleUrl for use in wfExpandUrl.
 * (bug 32168) fixed - wfExpandUrl expands dot segments now.
 * (bug 31535) Upload comments now truncated properly, and don't have brackets.
-* (bug 32858) Do not register links, categories, etc. from CSS/JS pages in the
-  database.
 * (bug 32086) Special:PermanentLink now show an error message when no subpage
   was specified.
 * (bug 30368) Special:Newpages now shows the new page name for moved pages.

diff --git a/includes/WikiPage.php b/includes/WikiPage.php
index 9c77e0a..a99734d 100644 (file)
--- a/includes/WikiPage.php
+++ b/includes/WikiPage.php
@@ -2021,18 +2021,7 @@ class WikiPage extends Page {
                $edit->newText = $text;
                $edit->pst = $wgParser->preSaveTransform( $text, $this->mTitle, $user, $popts );
                $edit->popts = $this->makeParserOptions( 'canonical' );
-
-               // Bug 32858: For a CSS/JS page, put a blank parser output into the 
-               // prepared edit, so that links etc. won't be registered in the 
-               // database. We could have set $edit->output to false or something if 
-               // we thought of this bug earlier, but now that would break the 
-               // interface with AbuseFilter etc.
-               if ( $this->mTitle->isCssOrJsPage() || $this->getTitle()->isCssJsSubpage() ) {
-                       $input = '';
-               } else {
-                       $input = $edit->pst;
-               }
-               $edit->output = $wgParser->parse( $input, $this->mTitle, $edit->popts, true, true, $revid );
+               $edit->output = $wgParser->parse( $edit->pst, $this->mTitle, $edit->popts, true, true, $revid );
                $edit->oldText = $this->getRawText();
 
                $this->mPreparedEdit = $edit;