| Index: trunk/phase3/includes/parser/Parser.php |
| — | — | @@ -3634,7 +3634,6 @@ |
| 3635 | 3635 | $this->mShowToc = false; |
| 3636 | 3636 | } |
| 3637 | 3637 | if ( isset( $this->mDoubleUnderscores['hiddencat'] ) && $this->mTitle->getNamespace() == NS_CATEGORY ) { |
| 3638 | | - $this->mOutput->setProperty( 'hiddencat', 'y' ); |
| 3639 | 3638 | $this->addTrackingCategory( 'hidden-category-category' ); |
| 3640 | 3639 | } |
| 3641 | 3640 | # (bug 8068) Allow control over whether robots index a page. |
| — | — | @@ -3649,6 +3648,11 @@ |
| 3650 | 3649 | $this->mOutput->setIndexPolicy( 'index' ); |
| 3651 | 3650 | $this->addTrackingCategory( 'index-category' ); |
| 3652 | 3651 | } |
| | 3652 | + |
| | 3653 | + # Cache all double underscores in the database |
| | 3654 | + foreach ( $this->mDoubleUnderscores as $key => $val ) { |
| | 3655 | + $this->mOutput->setProperty( $key, '' ); |
| | 3656 | + } |
| 3653 | 3657 | |
| 3654 | 3658 | wfProfileOut( __METHOD__ ); |
| 3655 | 3659 | return $text; |
| — | — | @@ -5137,6 +5141,7 @@ |
| 5138 | 5142 | */ |
| 5139 | 5143 | public function setDefaultSort( $sort ) { |
| 5140 | 5144 | $this->mDefaultSort = $sort; |
| | 5145 | + $this->mOutput->setPropert( 'defaultsort', $sort ); |
| 5141 | 5146 | } |
| 5142 | 5147 | |
| 5143 | 5148 | /** |
| Index: trunk/phase3/includes/parser/ParserOutput.php |
| — | — | @@ -259,6 +259,7 @@ |
| 260 | 260 | */ |
| 261 | 261 | public function setDisplayTitle( $text ) { |
| 262 | 262 | $this->setTitleText( $text ); |
| | 263 | + $this->setProperty( 'displaytitle', $text ); |
| 263 | 264 | } |
| 264 | 265 | |
| 265 | 266 | /** |
| Index: trunk/phase3/RELEASE-NOTES |
| — | — | @@ -106,6 +106,9 @@ |
| 107 | 107 | * ForeignApiRepo uses scriptDirUrl if apiBase not set |
| 108 | 108 | * (bug 24212) Added MediaWiki:Filepage.css which is also included on foreign |
| 109 | 109 | client wikis. |
| | 110 | +* (bug 14685) Double underscore magic word usage is now tracked in the |
| | 111 | + page_props table, as well as the behavioral magic words {{DEFAULTSORT}} and |
| | 112 | + {{DISPLAYTITLE}} |
| 110 | 113 | |
| 111 | 114 | === Bug fixes in 1.17 === |
| 112 | 115 | * (bug 17560) Half-broken deletion moved image files to deletion archive |