| Index: branches/wmf/1.18wmf1/includes/parser/Parser.php |
| — | — | @@ -3781,8 +3781,9 @@ |
| 3782 | 3782 | |
| 3783 | 3783 | # Inhibit editsection links if requested in the page |
| 3784 | 3784 | if ( isset( $this->mDoubleUnderscores['noeditsection'] ) ) { |
| 3785 | | - $showEditLink = 0; |
| | 3785 | + $maybeShowEditLink = $showEditLink = false; |
| 3786 | 3786 | } else { |
| | 3787 | + $maybeShowEditLink = true; /* Actual presence will depend on ParserOptions option */ |
| 3787 | 3788 | $showEditLink = $this->mOptions->getEditSection(); |
| 3788 | 3789 | } |
| 3789 | 3790 | if ( $showEditLink ) { |
| — | — | @@ -4037,7 +4038,7 @@ |
| 4038 | 4039 | ); |
| 4039 | 4040 | |
| 4040 | 4041 | # give headline the correct <h#> tag |
| 4041 | | - if ( $sectionIndex !== false ) { |
| | 4042 | + if ( $maybeShowEditLink && $sectionIndex !== false ) { |
| 4042 | 4043 | // Output edit section links as markers with styles that can be customized by skins |
| 4043 | 4044 | if ( $isTemplate ) { |
| 4044 | 4045 | # Put a T flag in the section identifier, to indicate to extractSections() |
| Property changes on: branches/wmf/1.18wmf1/includes/parser/Parser.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 4045 | 4046 | Merged /trunk/phase3/includes/parser/Parser.php:r100756,103074 |
| Index: branches/wmf/1.18wmf1/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/wmf/1.18wmf1/includes/OutputPage.php |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 1230 | 1231 | Merged /trunk/phase3/includes/OutputPage.php:r92703 |
| Index: branches/wmf/1.18wmf1/includes/Skin.php |
| — | — | @@ -435,7 +435,6 @@ |
| 436 | 436 | * @return String |
| 437 | 437 | */ |
| 438 | 438 | function getPageClasses( $title ) { |
| 439 | | - global $wgRequest; |
| 440 | 439 | $numeric = 'ns-' . $title->getNamespace(); |
| 441 | 440 | |
| 442 | 441 | if ( $title->getNamespace() == NS_SPECIAL ) { |
| — | — | @@ -454,13 +453,8 @@ |
| 455 | 454 | } |
| 456 | 455 | |
| 457 | 456 | $name = Sanitizer::escapeClass( 'page-' . $title->getPrefixedText() ); |
| 458 | | - |
| 459 | | - if ( $wgRequest->getVal('action') ) { |
| 460 | | - $action = 'action-' . $wgRequest->getVal('action'); |
| 461 | | - } else { |
| 462 | | - $action = 'action-view'; |
| 463 | | - } |
| 464 | | - return "$numeric $type $name $action"; |
| | 457 | + |
| | 458 | + return "$numeric $type $name"; |
| 465 | 459 | } |
| 466 | 460 | |
| 467 | 461 | /** |
| Property changes on: branches/wmf/1.18wmf1/includes |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 468 | 462 | Merged /trunk/phase3/includes:r92703,94131,100756,103074,107623 |
| Index: branches/wmf/1.18wmf1/resources/mediawiki.action/mediawiki.action.edit.js |
| — | — | @@ -85,7 +85,7 @@ |
| 86 | 86 | // Create button bar |
| 87 | 87 | mw.toolbar.init(); |
| 88 | 88 | |
| 89 | | - $( '#wpSummary, #wpTextbox1' ).focus( function() { |
| | 89 | + $( 'textarea, input:text' ).focus( function() { |
| 90 | 90 | currentFocused = $(this); |
| 91 | 91 | }); |
| 92 | 92 | |
| Property changes on: branches/wmf/1.18wmf1 |
| ___________________________________________________________________ |
| Modified: svn:mergeinfo |
| 93 | 93 | Merged /trunk/phase3:r92703,94131,100756,103074,107623 |