http://www.mediawiki.org/wiki/Special:Code/MediaWiki/76274

Revision: 76274
Author:   jeroendedauw
Date:     2010-11-07 22:45:20 +0000 (Sun, 07 Nov 2010)
Log Message:
-----------
Follow up to changes in Maps; version number increment

Modified Paths:
--------------
    trunk/extensions/SemanticMaps/INSTALL
    trunk/extensions/SemanticMaps/SemanticMaps.php
    
trunk/extensions/SemanticMaps/includes/services/OpenLayers/SM_OpenLayersFormInput.php
    
trunk/extensions/SemanticMaps/includes/services/OpenLayers/SM_OpenLayersQP.php

Modified: trunk/extensions/SemanticMaps/INSTALL
===================================================================
--- trunk/extensions/SemanticMaps/INSTALL       2010-11-07 22:43:20 UTC (rev 
76273)
+++ trunk/extensions/SemanticMaps/INSTALL       2010-11-07 22:45:20 UTC (rev 
76274)
@@ -1,4 +1,4 @@
-[[Semantic Maps 0.7.2]]
+[[Semantic Maps 0.7.3]]
 
 Make sure you have Semantic MediaWiki, Maps and Validator successfully 
installed before proceeding
 withthe installation. Semantic Maps and Maps are always released together. 
This means you should

Modified: trunk/extensions/SemanticMaps/SemanticMaps.php
===================================================================
--- trunk/extensions/SemanticMaps/SemanticMaps.php      2010-11-07 22:43:20 UTC 
(rev 76273)
+++ trunk/extensions/SemanticMaps/SemanticMaps.php      2010-11-07 22:45:20 UTC 
(rev 76274)
@@ -38,7 +38,7 @@
 
 // Only initialize the extension when all dependencies are present.
 if ( defined( 'Maps_VERSION' ) && defined( 'SMW_VERSION' ) ) {
-       define( 'SM_VERSION', '0.7.2' );
+       define( 'SM_VERSION', '0.7.3 alpha' );
 
        $useExtensionPath = version_compare( $wgVersion, '1.16', '>=' ) && 
isset( $wgExtensionAssetsPath ) && $wgExtensionAssetsPath;
        $smgScriptPath  = ( $useExtensionPath ? $wgExtensionAssetsPath : 
$wgScriptPath . '/extensions' ) . '/SemanticMaps';     

Modified: 
trunk/extensions/SemanticMaps/includes/services/OpenLayers/SM_OpenLayersFormInput.php
===================================================================
--- 
trunk/extensions/SemanticMaps/includes/services/OpenLayers/SM_OpenLayersFormInput.php
       2010-11-07 22:43:20 UTC (rev 76273)
+++ 
trunk/extensions/SemanticMaps/includes/services/OpenLayers/SM_OpenLayersFormInput.php
       2010-11-07 22:45:20 UTC (rev 76274)
@@ -47,8 +47,6 @@
                        wfMsg( 'maps-loading-map' )
                );
                
-               $this->service->addLayerDependencies( $this->layers[1] );
-               
                $langCode = $wgLang->getCode();
                
                MapsMapper::addInlineScript( $this->service,<<<EOT
@@ -60,7 +58,7 @@
                        $this->zoom,
                        {$this->markerCoords['lat']},
                        {$this->markerCoords['lon']},
-                       {$this->layers[0]},
+                       {$this->layers},
                        [$this->controls],
                        "$langCode"
                );

Modified: 
trunk/extensions/SemanticMaps/includes/services/OpenLayers/SM_OpenLayersQP.php
===================================================================
--- 
trunk/extensions/SemanticMaps/includes/services/OpenLayers/SM_OpenLayersQP.php  
    2010-11-07 22:43:20 UTC (rev 76273)
+++ 
trunk/extensions/SemanticMaps/includes/services/OpenLayers/SM_OpenLayersQP.php  
    2010-11-07 22:45:20 UTC (rev 76274)
@@ -34,8 +34,6 @@
                        wfMsg( 'maps-loading-map' )
                );
 
-               $this->service->addLayerDependencies( $this->layers[1] );
-               
                $langCode = $wgLang->getCode();
                
                MapsMapper::addInlineScript( $this->service, <<<EOT
@@ -44,7 +42,7 @@
                        $this->centreLat,
                        $this->centreLon,
                        $this->zoom,
-                       {$this->layers[0]},
+                       {$this->layers},
                        [$this->controls],
                        $this->markerJs,
                        "$langCode"


_______________________________________________
MediaWiki-CVS mailing list
[email protected]
https://lists.wikimedia.org/mailman/listinfo/mediawiki-cvs

Reply via email to