https://www.mediawiki.org/wiki/Special:Code/MediaWiki/114280
Revision: 114280
Author: jeroendedauw
Date: 2012-03-20 16:40:16 +0000 (Tue, 20 Mar 2012)
Log Message:
-----------
kill obsolete code
Modified Paths:
--------------
trunk/extensions/SemanticMediaWiki/SemanticMediaWiki.hooks.php
trunk/extensions/SemanticMediaWiki/includes/SMW_Setup.php
Modified: trunk/extensions/SemanticMediaWiki/SemanticMediaWiki.hooks.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/SemanticMediaWiki.hooks.php
2012-03-20 16:37:58 UTC (rev 114279)
+++ trunk/extensions/SemanticMediaWiki/SemanticMediaWiki.hooks.php
2012-03-20 16:40:16 UTC (rev 114280)
@@ -176,20 +176,6 @@
}
/**
- * @see SMWHooks::addSemanticExtensionType
- *
- * @since 1.7.1
- *
- * @param $oSpecialVersion SpecialVersion
- * @param $aExtensionTypes Array
- *
- * @return true
- */
- public static function oldAddSemanticExtensionType( SpecialVersion
&$oSpecialVersion, array &$aExtensionTypes ) {
- return self::addSemanticExtensionType( $aExtensionTypes );
- }
-
- /**
* Register tables to be added to temporary tables for parser tests.
* @todo Hard-coding this thwarts the modularity/exchangability of the SMW
* storage backend. The actual list of required tables depends on the
backend
Modified: trunk/extensions/SemanticMediaWiki/includes/SMW_Setup.php
===================================================================
--- trunk/extensions/SemanticMediaWiki/includes/SMW_Setup.php 2012-03-20
16:37:58 UTC (rev 114279)
+++ trunk/extensions/SemanticMediaWiki/includes/SMW_Setup.php 2012-03-20
16:40:16 UTC (rev 114280)
@@ -103,13 +103,7 @@
$wgHooks['SkinAfterContent'][] = 'SMWFactbox::onSkinAfterContent'; //
draw Factbox below categories
$wgHooks['SkinGetPoweredBy'][] = 'SMWHooks::addPoweredBySMW';
- if ( version_compare( $wgVersion, '1.17alpha', '>=' ) ) {
- // For MediaWiki 1.17 alpha and later.
- $wgHooks['ExtensionTypes'][] =
'SMWHooks::addSemanticExtensionType';
- } else {
- // For pre-MediaWiki 1.17 alpha.
- $wgHooks['SpecialVersionExtensionTypes'][] =
'SMWHooks::oldAddSemanticExtensionType';
- }
+ $wgHooks['ExtensionTypes'][] = 'SMWHooks::addSemanticExtensionType';
}
/**
@@ -417,15 +411,15 @@
*/
function smwfSetupExtension() {
wfProfileIn( 'smwfSetupExtension (SMW)' );
- global $smwgIP, $smwgScriptPath, $wgFooterIcons, $smwgMasterStore,
$smwgIQRunningNumber;
+ global $smwgScriptPath, $wgFooterIcons, $smwgMasterStore,
$smwgIQRunningNumber;
$smwgMasterStore = null;
$smwgIQRunningNumber = 0;
- if ( isset($wgFooterIcons["poweredby"])
- && isset($wgFooterIcons["poweredby"]["semanticmediawiki"])
- && is_null( $wgFooterIcons["poweredby"]["semanticmediawiki"]["src"] )
) {
- $wgFooterIcons["poweredby"]["semanticmediawiki"]["src"] =
"$smwgScriptPath/skins/images/smw_button.png";
+ if ( isset( $wgFooterIcons['poweredby'] )
+ && isset( $wgFooterIcons['poweredby']['semanticmediawiki'] )
+ && is_null( $wgFooterIcons['poweredby']['semanticmediawiki']['src'] )
) {
+ $wgFooterIcons['poweredby']['semanticmediawiki']['src'] =
"$smwgScriptPath/skins/images/smw_button.png";
}
wfProfileOut( 'smwfSetupExtension (SMW)' );
_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs
