r95371 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r95370‎ | r95371 | r95372 >
Date:01:46, 24 August 2011
Author:jeroendedauw
Status:deferred
Tags:lamecommitsummary 
Comment:
Modified paths:
  • /trunk/extensions/SemanticMaps/INSTALL (modified) (history)
  • /trunk/extensions/SemanticMaps/SemanticMaps.php (modified) (history)
  • /trunk/extensions/SemanticMaps/includes/forminputs/SM_FormInput.php (modified) (history)
  • /trunk/extensions/SemanticMaps/includes/queryprinters/SM_MapPrinter.php (modified) (history)

Diff [purge]

Index: trunk/extensions/SemanticMaps/INSTALL
@@ -1,4 +1,4 @@
2 -[[Semantic Maps 1.0.2]]
 2+[[Semantic Maps 1.0.3]]
33
44 You can find a wiki version of this document, which includes various helpfull links, at
55 http://mapping.referata.com/wiki/Help:Installation#Semantic_Maps
Index: trunk/extensions/SemanticMaps/includes/forminputs/SM_FormInput.php
@@ -131,6 +131,11 @@
132132
133133 $configVars = Skin::makeVariablesScript( $this->service->getConfigVariables() );
134134
 135+ // MediaWiki 1.17 does not play nice with addScript, so add the vars via the globals hook.
 136+ if ( version_compare( $GLOBALS['wgVersion'], '1.18', '<' ) ) {
 137+ $GLOBALS['egMapsGlobalJSVars'] += $this->service->getConfigVariables();
 138+ }
 139+
135140 if ( true /* !is_null( $wgTitle ) && $wgTitle->isSpecialPage() */ ) { // TODO
136141 global $wgOut;
137142 $this->service->addDependencies( $wgOut );
Index: trunk/extensions/SemanticMaps/includes/queryprinters/SM_MapPrinter.php
@@ -192,6 +192,11 @@
193193
194194 $mapName = $this->service->getMapId();
195195
 196+ // MediaWiki 1.17 does not play nice with addScript, so add the vars via the globals hook.
 197+ if ( version_compare( $GLOBALS['wgVersion'], '1.18', '<' ) ) {
 198+ $GLOBALS['egMapsGlobalJSVars'] += $this->service->getConfigVariables();
 199+ }
 200+
196201 SMWOutputs::requireHeadItem(
197202 $mapName,
198203 $this->service->getDependencyHtml() .
Index: trunk/extensions/SemanticMaps/SemanticMaps.php
@@ -45,7 +45,7 @@
4646 die( '<b>Error:</b> This version of Semantic Maps requires Semantic MediaWiki 1.6 or above; use Semantic Maps 0.7.x for older versions.' );
4747 }
4848
49 -define( 'SM_VERSION', '1.0.2' );
 49+define( 'SM_VERSION', '1.0.3 alpha' );
5050
5151 $wgExtensionCredits[defined( 'SEMANTIC_EXTENSION_TYPE' ) ? 'semantic' : 'other'][] = array(
5252 'path' => __FILE__,

Past revisions this follows-up on

RevisionCommit summaryAuthorDate
r95369fix js issuejeroendedauw01:42, 24 August 2011

Status & tagging log