r76274 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r76273‎ | r76274 | r76275 >
Date:22:45, 7 November 2010
Author:jeroendedauw
Status:deferred
Tags:
Comment:
Follow up to changes in Maps; version number increment
Modified paths:
  • /trunk/extensions/SemanticMaps/INSTALL (modified) (history)
  • /trunk/extensions/SemanticMaps/SemanticMaps.php (modified) (history)
  • /trunk/extensions/SemanticMaps/includes/services/OpenLayers/SM_OpenLayersFormInput.php (modified) (history)
  • /trunk/extensions/SemanticMaps/includes/services/OpenLayers/SM_OpenLayersQP.php (modified) (history)

Diff [purge]

Index: trunk/extensions/SemanticMaps/INSTALL
@@ -1,4 +1,4 @@
2 -[[Semantic Maps 0.7.2]]
 2+[[Semantic Maps 0.7.3]]
33
44 Make sure you have Semantic MediaWiki, Maps and Validator successfully installed before proceeding
55 withthe installation. Semantic Maps and Maps are always released together. This means you should
Index: trunk/extensions/SemanticMaps/includes/services/OpenLayers/SM_OpenLayersQP.php
@@ -34,8 +34,6 @@
3535 wfMsg( 'maps-loading-map' )
3636 );
3737
38 - $this->service->addLayerDependencies( $this->layers[1] );
39 -
4038 $langCode = $wgLang->getCode();
4139
4240 MapsMapper::addInlineScript( $this->service, <<<EOT
@@ -44,7 +42,7 @@
4543 $this->centreLat,
4644 $this->centreLon,
4745 $this->zoom,
48 - {$this->layers[0]},
 46+ {$this->layers},
4947 [$this->controls],
5048 $this->markerJs,
5149 "$langCode"
Index: trunk/extensions/SemanticMaps/includes/services/OpenLayers/SM_OpenLayersFormInput.php
@@ -47,8 +47,6 @@
4848 wfMsg( 'maps-loading-map' )
4949 );
5050
51 - $this->service->addLayerDependencies( $this->layers[1] );
52 -
5351 $langCode = $wgLang->getCode();
5452
5553 MapsMapper::addInlineScript( $this->service,<<<EOT
@@ -60,7 +58,7 @@
6159 $this->zoom,
6260 {$this->markerCoords['lat']},
6361 {$this->markerCoords['lon']},
64 - {$this->layers[0]},
 62+ {$this->layers},
6563 [$this->controls],
6664 "$langCode"
6765 );
Index: trunk/extensions/SemanticMaps/SemanticMaps.php
@@ -38,7 +38,7 @@
3939
4040 // Only initialize the extension when all dependencies are present.
4141 if ( defined( 'Maps_VERSION' ) && defined( 'SMW_VERSION' ) ) {
42 - define( 'SM_VERSION', '0.7.2' );
 42+ define( 'SM_VERSION', '0.7.3 alpha' );
4343
4444 $useExtensionPath = version_compare( $wgVersion, '1.16', '>=' ) && isset( $wgExtensionAssetsPath ) && $wgExtensionAssetsPath;
4545 $smgScriptPath = ( $useExtensionPath ? $wgExtensionAssetsPath : $wgScriptPath . '/extensions' ) . '/SemanticMaps';

Status & tagging log