| Index: trunk/phase3/includes/parser/ParserOutput.php |
| — | — | @@ -28,8 +28,7 @@ |
| 29 | 29 | $mSections = array(), # Table of contents |
| 30 | 30 | $mProperties = array(), # Name/value pairs to be cached in the DB |
| 31 | 31 | $mTOCHTML = ''; # HTML of the TOC |
| 32 | | - private $mIndexPolicy = '', # 'index' or 'noindex'? Any other value will result in no change. |
| 33 | | - $mPageIcons = array(); # Array of icons to show for the page (like Protect, Featured, etc) |
| | 32 | + private $mIndexPolicy = ''; # 'index' or 'noindex'? Any other value will result in no change. |
| 34 | 33 | |
| 35 | 34 | function ParserOutput( $text = '', $languageLinks = array(), $categoryLinks = array(), |
| 36 | 35 | $containsOldMagic = false, $titletext = '' ) |
| — | — | @@ -60,7 +59,6 @@ |
| 61 | 60 | function getWarnings() { return array_keys( $this->mWarnings ); } |
| 62 | 61 | function getIndexPolicy() { return $this->mIndexPolicy; } |
| 63 | 62 | function getTOCHTML() { return $this->mTOCHTML; } |
| 64 | | - function getPageIcons() { return $this->mPageIcons; } |
| 65 | 63 | |
| 66 | 64 | function containsOldMagic() { return $this->mContainsOldMagic; } |
| 67 | 65 | function setText( $text ) { return wfSetVar( $this->mText, $text ); } |
| — | — | @@ -253,15 +251,6 @@ |
| 254 | 252 | } |
| 255 | 253 | |
| 256 | 254 | /** |
| 257 | | - * Add page icons to the parser output. |
| 258 | | - * @param File $file A valid file |
| 259 | | - * @param String $alt Alt text, if any |
| 260 | | - */ |
| 261 | | - function addPageIcon( $file, $alt = '' ) { |
| 262 | | - $this->mPageIcons[] = array( $file, $alt ); |
| 263 | | - } |
| 264 | | - |
| 265 | | - /** |
| 266 | 255 | * Override the title to be used for display |
| 267 | 256 | * -- this is assumed to have been validated |
| 268 | 257 | * (check equal normalisation, etc.) |
| Index: trunk/phase3/includes/parser/CoreParserFunctions.php |
| — | — | @@ -69,7 +69,6 @@ |
| 70 | 70 | $parser->setFunctionHook( 'subjectpagenamee', array( __CLASS__, 'subjectpagenamee' ), SFH_NO_HASH ); |
| 71 | 71 | $parser->setFunctionHook( 'tag', array( __CLASS__, 'tagObj' ), SFH_OBJECT_ARGS ); |
| 72 | 72 | $parser->setFunctionHook( 'formatdate', array( __CLASS__, 'formatDate' ) ); |
| 73 | | - $parser->setFunctionHook( 'pageicon', array( __CLASS__, 'pageicon' ) ); |
| 74 | 73 | |
| 75 | 74 | if ( $wgAllowDisplayTitle ) { |
| 76 | 75 | $parser->setFunctionHook( 'displaytitle', array( __CLASS__, 'displaytitle' ), SFH_NO_HASH ); |
| — | — | @@ -629,14 +628,6 @@ |
| 630 | 629 | } |
| 631 | 630 | } |
| 632 | 631 | |
| 633 | | - public static function pageicon( $parser, $name = '', $alt = '' ) { |
| 634 | | - $file = wfFindFile( $name ); |
| 635 | | - if( $file ) { |
| 636 | | - $parser->mOutput->addPageIcon( $file, $alt ); |
| 637 | | - } |
| 638 | | - return ''; |
| 639 | | - } |
| 640 | | - |
| 641 | 632 | /** |
| 642 | 633 | * Parser function to extension tag adaptor |
| 643 | 634 | */ |
| Index: trunk/phase3/includes/OutputPage.php |
| — | — | @@ -39,7 +39,6 @@ |
| 40 | 40 | var $mParseWarnings = array(); |
| 41 | 41 | var $mSquidMaxage = 0; |
| 42 | 42 | var $mRevisionId = null; |
| 43 | | - var $mPageIcons = array(); |
| 44 | 43 | protected $mTitle = null; |
| 45 | 44 | |
| 46 | 45 | /** |
| — | — | @@ -1080,7 +1079,6 @@ |
| 1081 | 1080 | $this->addCategoryLinks( $parserOutput->getCategories() ); |
| 1082 | 1081 | $this->mNewSectionLink = $parserOutput->getNewSection(); |
| 1083 | 1082 | $this->mHideNewSectionLink = $parserOutput->getHideNewSection(); |
| 1084 | | - $this->mPageIcons = $parserOutput->getPageIcons(); |
| 1085 | 1083 | |
| 1086 | 1084 | $this->mParseWarnings = $parserOutput->getWarnings(); |
| 1087 | 1085 | if ( !$parserOutput->isCacheable() ) { |
| Index: trunk/phase3/includes/SkinTemplate.php |
| — | — | @@ -230,21 +230,6 @@ |
| 231 | 231 | $tpl->set( 'pageclass', $this->getPageClasses( $this->mTitle ) ); |
| 232 | 232 | $tpl->set( 'skinnameclass', ( 'skin-' . Sanitizer::escapeClass( $this->getSkinName() ) ) ); |
| 233 | 233 | |
| 234 | | - $icons = ''; |
| 235 | | - foreach( $out->mPageIcons as $icon ) { |
| 236 | | - list( $file, $alt ) = $icon; |
| 237 | | - $fileAttr = array( 'src' => $file->createThumb( 16 ) ); |
| 238 | | - if( $alt != '' ) { |
| 239 | | - $msg = wfMsg( $alt ); |
| 240 | | - if( !wfEmptyMsg( $alt ) ) { |
| 241 | | - $alt = $msg; |
| 242 | | - } |
| 243 | | - $fileAttr['alt'] = htmlspecialchars( $alt ); |
| 244 | | - } |
| 245 | | - $icons .= Html::element( 'img', $fileAttr ) . " "; |
| 246 | | - } |
| 247 | | - $tpl->set( 'pageicons', $icons ); |
| 248 | | - |
| 249 | 234 | $nsname = MWNamespace::exists( $this->mTitle->getNamespace() ) ? |
| 250 | 235 | MWNamespace::getCanonicalName( $this->mTitle->getNamespace() ) : |
| 251 | 236 | $this->mTitle->getNsText(); |
| Index: trunk/phase3/languages/messages/MessagesEn.php |
| — | — | @@ -356,7 +356,6 @@ |
| 357 | 357 | 'url_path' => array( 0, 'PATH' ), |
| 358 | 358 | 'url_wiki' => array( 0, 'WIKI' ), |
| 359 | 359 | 'url_query' => array( 0, 'QUERY' ), |
| 360 | | - 'pageicon' => array( 1, 'pageicon' ), |
| 361 | 360 | ); |
| 362 | 361 | |
| 363 | 362 | /** |