| Index: trunk/extensions/SemanticMediaWiki/SemanticMediaWiki.hooks.php |
| — | — | @@ -176,20 +176,6 @@ |
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | /** |
| 180 | | - * @see SMWHooks::addSemanticExtensionType |
| 181 | | - * |
| 182 | | - * @since 1.7.1 |
| 183 | | - * |
| 184 | | - * @param $oSpecialVersion SpecialVersion |
| 185 | | - * @param $aExtensionTypes Array |
| 186 | | - * |
| 187 | | - * @return true |
| 188 | | - */ |
| 189 | | - public static function oldAddSemanticExtensionType( SpecialVersion &$oSpecialVersion, array &$aExtensionTypes ) { |
| 190 | | - return self::addSemanticExtensionType( $aExtensionTypes ); |
| 191 | | - } |
| 192 | | - |
| 193 | | - /** |
| 194 | 180 | * Register tables to be added to temporary tables for parser tests. |
| 195 | 181 | * @todo Hard-coding this thwarts the modularity/exchangability of the SMW |
| 196 | 182 | * storage backend. The actual list of required tables depends on the backend |
| Index: trunk/extensions/SemanticMediaWiki/includes/SMW_Setup.php |
| — | — | @@ -103,13 +103,7 @@ |
| 104 | 104 | $wgHooks['SkinAfterContent'][] = 'SMWFactbox::onSkinAfterContent'; // draw Factbox below categories |
| 105 | 105 | $wgHooks['SkinGetPoweredBy'][] = 'SMWHooks::addPoweredBySMW'; |
| 106 | 106 | |
| 107 | | - if ( version_compare( $wgVersion, '1.17alpha', '>=' ) ) { |
| 108 | | - // For MediaWiki 1.17 alpha and later. |
| 109 | | - $wgHooks['ExtensionTypes'][] = 'SMWHooks::addSemanticExtensionType'; |
| 110 | | - } else { |
| 111 | | - // For pre-MediaWiki 1.17 alpha. |
| 112 | | - $wgHooks['SpecialVersionExtensionTypes'][] = 'SMWHooks::oldAddSemanticExtensionType'; |
| 113 | | - } |
| | 107 | + $wgHooks['ExtensionTypes'][] = 'SMWHooks::addSemanticExtensionType'; |
| 114 | 108 | } |
| 115 | 109 | |
| 116 | 110 | /** |
| — | — | @@ -417,15 +411,15 @@ |
| 418 | 412 | */ |
| 419 | 413 | function smwfSetupExtension() { |
| 420 | 414 | wfProfileIn( 'smwfSetupExtension (SMW)' ); |
| 421 | | - global $smwgIP, $smwgScriptPath, $wgFooterIcons, $smwgMasterStore, $smwgIQRunningNumber; |
| | 415 | + global $smwgScriptPath, $wgFooterIcons, $smwgMasterStore, $smwgIQRunningNumber; |
| 422 | 416 | |
| 423 | 417 | $smwgMasterStore = null; |
| 424 | 418 | $smwgIQRunningNumber = 0; |
| 425 | 419 | |
| 426 | | - if ( isset($wgFooterIcons["poweredby"]) |
| 427 | | - && isset($wgFooterIcons["poweredby"]["semanticmediawiki"]) |
| 428 | | - && is_null( $wgFooterIcons["poweredby"]["semanticmediawiki"]["src"] ) ) { |
| 429 | | - $wgFooterIcons["poweredby"]["semanticmediawiki"]["src"] = "$smwgScriptPath/skins/images/smw_button.png"; |
| | 420 | + if ( isset( $wgFooterIcons['poweredby'] ) |
| | 421 | + && isset( $wgFooterIcons['poweredby']['semanticmediawiki'] ) |
| | 422 | + && is_null( $wgFooterIcons['poweredby']['semanticmediawiki']['src'] ) ) { |
| | 423 | + $wgFooterIcons['poweredby']['semanticmediawiki']['src'] = "$smwgScriptPath/skins/images/smw_button.png"; |
| 430 | 424 | } |
| 431 | 425 | |
| 432 | 426 | wfProfileOut( 'smwfSetupExtension (SMW)' ); |