r69726 MediaWiki - Code Review archive

Repository:MediaWiki
Revision:r69725‎ | r69726 | r69727 >
Date:12:06, 22 July 2010
Author:jeroendedauw
Status:deferred
Tags:
Comment:
Changes for 0.6.5 - Fixed Xml::encodeJsVar issue
Modified paths:
  • /trunk/extensions/Maps/Maps.php (modified) (history)
  • /trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMaps.php (modified) (history)
  • /trunk/extensions/Maps/Services/GoogleMaps3/Maps_GoogleMaps3.php (modified) (history)
  • /trunk/extensions/Maps/Services/OpenLayers/Maps_OpenLayers.php (modified) (history)
  • /trunk/extensions/Maps/Services/YahooMaps/Maps_YahooMaps.php (modified) (history)

Diff [purge]

Index: trunk/extensions/Maps/Services/GoogleMaps3/Maps_GoogleMaps3.php
@@ -107,7 +107,7 @@
108108 $markerItems = array();
109109
110110 foreach ( $markers as $marker ) {
111 - $markerItems[] = Xml::encodeJsVar( array(
 111+ $markerItems[] = Xml::encodeJsVar( (object)array(
112112 'lat' => $marker[0],
113113 'lon' => $marker[1],
114114 'title' => $marker[2],
Index: trunk/extensions/Maps/Services/YahooMaps/Maps_YahooMaps.php
@@ -126,7 +126,7 @@
127127 $markerItems = array();
128128
129129 foreach ( $markers as $marker ) {
130 - $markerItems[] = Xml::encodeJsVar( array(
 130+ $markerItems[] = Xml::encodeJsVar( (object)array(
131131 'lat' => $marker[0],
132132 'lon' => $marker[1],
133133 'title' => $marker[2],
Index: trunk/extensions/Maps/Services/OpenLayers/Maps_OpenLayers.php
@@ -110,7 +110,7 @@
111111 $markerItems = array();
112112
113113 foreach ( $markers as $marker ) {
114 - $markerItems[] = Xml::encodeJsVar( array(
 114+ $markerItems[] = Xml::encodeJsVar( (object)array(
115115 'lat' => $marker[0],
116116 'lon' => $marker[1],
117117 'title' => $marker[2],
Index: trunk/extensions/Maps/Services/GoogleMaps/Maps_GoogleMaps.php
@@ -128,7 +128,7 @@
129129 $markerItems = array();
130130
131131 foreach ( $markers as $marker ) {
132 - $markerItems[] = Xml::encodeJsVar( array(
 132+ $markerItems[] = Xml::encodeJsVar( (object)array(
133133 'lat' => $marker[0],
134134 'lon' => $marker[1],
135135 'title' => $marker[2],
Index: trunk/extensions/Maps/Maps.php
@@ -33,7 +33,7 @@
3434 echo '<b>Warning:</b> You need to have <a href="http://www.mediawiki.org/wiki/Extension:Validator">Validator</a> installed in order to use <a href="http://www.mediawiki.org/wiki/Extension:Maps">Maps</a>.';
3535 }
3636 else {
37 - define( 'Maps_VERSION', '0.6.5 rc1' );
 37+ define( 'Maps_VERSION', '0.6.5 a11' );
3838
3939 // The different coordinate notations.
4040 define( 'Maps_COORDS_FLOAT', 'float' );

Status & tagging log