Index: branches/REL1_18/phase3/RELEASE-NOTES-1.18 |
— | — | @@ -30,6 +30,7 @@ |
31 | 31 | * (bug 33305) Make mw.util.addCSS resistant to IE's @font-face bug by setting |
32 | 32 | cssText after DOM insertion. |
33 | 33 | * (bug 29102) Upgrades no longer fail with the error "Unknown character set: 'mysql4'. |
| 34 | +* (bug 25355) Parser generates edit section links for special pages. |
34 | 35 | |
35 | 36 | == MediaWiki 1.18 == |
36 | 37 | 2011-11-24 |
Index: branches/REL1_18/phase3/includes/Skin.php |
— | — | @@ -449,7 +449,6 @@ |
450 | 450 | * @return String |
451 | 451 | */ |
452 | 452 | function getPageClasses( $title ) { |
453 | | - global $wgRequest; |
454 | 453 | $numeric = 'ns-' . $title->getNamespace(); |
455 | 454 | |
456 | 455 | if ( $title->getNamespace() == NS_SPECIAL ) { |
— | — | @@ -468,13 +467,8 @@ |
469 | 468 | } |
470 | 469 | |
471 | 470 | $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"; |
479 | 473 | } |
480 | 474 | |
481 | 475 | /** |
Index: branches/REL1_18/phase3/includes/OutputPage.php |
— | — | @@ -1223,6 +1223,7 @@ |
1224 | 1224 | public function parserOptions( $options = null ) { |
1225 | 1225 | if ( !$this->mParserOptions ) { |
1226 | 1226 | $this->mParserOptions = new ParserOptions; |
| 1227 | + $this->mParserOptions->setEditSection( false ); |
1227 | 1228 | } |
1228 | 1229 | return wfSetVar( $this->mParserOptions, $options ); |
1229 | 1230 | } |
Property changes on: branches/REL1_18/phase3/includes/OutputPage.php |
___________________________________________________________________ |
Modified: svn:mergeinfo |
1230 | 1231 | Merged /trunk/phase3/includes/OutputPage.php:r92703 |
Property changes on: branches/REL1_18/phase3/includes |
___________________________________________________________________ |
Modified: svn:mergeinfo |
1231 | 1232 | Merged /trunk/phase3/includes:r92703,94131 |
Property changes on: branches/REL1_18/phase3 |
___________________________________________________________________ |
Modified: svn:mergeinfo |
1232 | 1233 | Merged /trunk/phase3:r92703,94131 |