r95167 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r95166‎ | r95167 | r95168 >
Date:18:30, 21 August 2011
Author:dantman
Status:ok
Tags:
Comment:
Followup r95166, removing this from 1.18 before it is released and we can't remove it from 1.19.
Modified paths:
  • /branches/REL1_18/phase3/includes/Skin.php (modified) (history)

Diff [purge]

Index: branches/REL1_18/phase3/includes/Skin.php
@@ -1215,7 +1215,6 @@
12161216 */
12171217 function addToSidebarPlain( &$bar, $text ) {
12181218 $lines = explode( "\n", $text );
1219 - $wikiBar = array(); # We need to handle the wikitext on a different variable, to avoid trying to do an array operation on text, which would be a fatal error.
12201219
12211220 $heading = '';
12221221
@@ -1295,25 +1294,12 @@
12961295 'id' => 'n-' . Sanitizer::escapeId( strtr( $line[1], ' ', '-' ), 'noninitial' ),
12971296 'active' => false
12981297 ), $extraAttribs );
1299 - } elseif ( ( substr( $line, 0, 2 ) == '{{' ) && ( substr( $line, -2 ) == '}}' ) ) {
1300 - global $wgParser;
1301 -
1302 - $line = substr( $line, 2, strlen( $line ) - 4 );
1303 -
1304 - $options = new ParserOptions();
1305 - $options->setEditSection( false );
1306 - $options->setInterfaceMessage( true );
1307 - $wikiBar[$heading] = $wgParser->parse( wfMsgForContentNoTrans( $line ) , $this->getTitle(), $options )->getText();
13081298 } else {
13091299 continue;
13101300 }
13111301 }
13121302 }
13131303
1314 - if ( count( $wikiBar ) > 0 ) {
1315 - $bar = array_merge( $bar, $wikiBar );
1316 - }
1317 -
13181304 return $bar;
13191305 }
13201306

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r95166Remove the * {{msg}} syntax introduced to MediaWiki:Sidebar in r66974. This s...dantman18:23, 21 August 2011

Status & tagging log