r108620 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r108619‎ | r108620 | r108621 >
Date:14:53, 11 January 2012
Author:reedy
Status:ok
Tags:
Comment:
MFT r92703, r94131

Move RELEASE-NOTES to 1.18
Modified paths:
  • /branches/REL1_18/phase3 (modified) (history)
  • /branches/REL1_18/phase3/RELEASE-NOTES-1.18 (modified) (history)
  • /branches/REL1_18/phase3/includes (modified) (history)
  • /branches/REL1_18/phase3/includes/OutputPage.php (modified) (history)
  • /branches/REL1_18/phase3/includes/Skin.php (modified) (history)

Diff [purge]

Index: branches/REL1_18/phase3/RELEASE-NOTES-1.18
@@ -30,6 +30,7 @@
3131 * (bug 33305) Make mw.util.addCSS resistant to IE's @font-face bug by setting
3232 cssText after DOM insertion.
3333 * (bug 29102) Upgrades no longer fail with the error "Unknown character set: 'mysql4'.
 34+* (bug 25355) Parser generates edit section links for special pages.
3435
3536 == MediaWiki 1.18 ==
3637 2011-11-24
Index: branches/REL1_18/phase3/includes/Skin.php
@@ -449,7 +449,6 @@
450450 * @return String
451451 */
452452 function getPageClasses( $title ) {
453 - global $wgRequest;
454453 $numeric = 'ns-' . $title->getNamespace();
455454
456455 if ( $title->getNamespace() == NS_SPECIAL ) {
@@ -468,13 +467,8 @@
469468 }
470469
471470 $name = Sanitizer::escapeClass( 'page-' . $title->getPrefixedText() );
472 -
473 - if ( $wgRequest->getVal('action') ) {
474 - $action = 'action-' . $wgRequest->getVal('action');
475 - } else {
476 - $action = 'action-view';
477 - }
478 - return "$numeric $type $name $action";
 471+
 472+ return "$numeric $type $name";
479473 }
480474
481475 /**
Index: branches/REL1_18/phase3/includes/OutputPage.php
@@ -1223,6 +1223,7 @@
12241224 public function parserOptions( $options = null ) {
12251225 if ( !$this->mParserOptions ) {
12261226 $this->mParserOptions = new ParserOptions;
 1227+ $this->mParserOptions->setEditSection( false );
12271228 }
12281229 return wfSetVar( $this->mParserOptions, $options );
12291230 }
Property changes on: branches/REL1_18/phase3/includes/OutputPage.php
___________________________________________________________________
Modified: svn:mergeinfo
12301231 Merged /trunk/phase3/includes/OutputPage.php:r92703
Property changes on: branches/REL1_18/phase3/includes
___________________________________________________________________
Modified: svn:mergeinfo
12311232 Merged /trunk/phase3/includes:r92703,94131
Property changes on: branches/REL1_18/phase3
___________________________________________________________________
Modified: svn:mergeinfo
12321233 Merged /trunk/phase3:r92703,94131

Follow-up revisions

RevisionCommit summaryAuthorDate
r108621Kill bug 25355 RELEASE-NOTES-1.19 from r92703 as moved to 1.18 in r108620reedy14:53, 11 January 2012
r108627Revert r94131 out of 1.18 from r108620reedy15:40, 11 January 2012

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r92703(bug 25355) Parser generates edit section links for special pages...demon22:32, 20 July 2011
r94131Reverted r91871 per CR: http://www.mediawiki.org/wiki/Special:Code/MediaWiki/......aaron18:36, 9 August 2011

Status & tagging log