r96844 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r96843‎ | r96844 | r96845 >
Date:14:46, 12 September 2011
Author:yaron
Status:deferred
Tags:
Comment:
Follow-up to r95193 - re-added backward-compatibility for MW < 1.16
Modified paths:
  • /trunk/extensions/SemanticMediaWiki/includes/SMW_Outputs.php (modified) (history)

Diff [purge]

Index: trunk/extensions/SemanticMediaWiki/includes/SMW_Outputs.php
@@ -117,7 +117,13 @@
118118 */
119119 static public function requireFromParserOutput( ParserOutput $parserOutput ) {
120120 // Note: we do not attempt to recover which head items where scripts here.
121 - self::$headItems = array_merge( (array)self::$headItems, $parserOutput->getHeadItems() );
 121+ // ParserOutpt::getHeadItems() was added in MW 1.16
 122+ if ( is_callable( array( $parserOutput, 'getHeadItems' ) ) ) {
 123+ $parserOutputHeadItems = $parserOutput->getHeadItems();
 124+ } else {
 125+ $parserOutputHeadItems = (array)$parserOutput->headItems;
 126+ }
 127+ self::$headItems = array_merge( (array)self::$headItems, $parserOutputHeadItems );
122128 /// TODO Is the following needed?
123129 if ( isset( $parserOutput->mModules ) ) {
124130 foreach ( $parserOutput->mModules as $module ) {

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r95193Followup r95172, use the getter instead of nonexistent member variablenikerabbit08:25, 22 August 2011