Changeset 7576

Timestamp:

Nov 2, 2010, 6:43:50 PM (13 years ago)

Author:

grum

Message:

fix bug:1996 - Incompatibility with PHP prior than 5.2.2

Location:

extensions/GMaps

Files:

• gmaps_pip.class.inc.php (modified) (2 diffs)
• gmaps_version.inc.php (modified) (1 diff)
• main.inc.php (modified) (2 diffs)

extensions/GMaps/gmaps_pip.class.inc.php

@@ -117 +117 @@
 
     $mapParams=array();
-    if(preg_match_all('/\[gmaps=(?:id:(?<id>\d+);|width:(?<width>\d+);|height:(?<height>\d+);|markerImg:(?<markerImg>[a-z0-9\-\._]+);|kmlId:(?<kmlId>\d+);|kmlUrl:"(?<kmlUrl>.+)";|allowBubble:(?<allowBubble>y|n);|kmlZoom:(?<kmlZoom>y|n);|markerVisible:(?<markerVisible>y|n);)+\]/i',$desc,$mapParams,PREG_SET_ORDER)>0)
+    if(preg_match_all('/\[gmaps=(?:id:(?P<id>\d+);|width:(?P<width>\d+);|height:(?P<height>\d+);|markerImg:(?P<markerImg>[a-z0-9\-\._]+);|kmlId:(?P<kmlId>\d+);|kmlUrl:"(?P<kmlUrl>.+)";|allowBubble:(?P<allowBubble>y|n);|kmlZoom:(?P<kmlZoom>y|n);|markerVisible:(?P<markerVisible>y|n);)+\]/i',$desc,$mapParams,PREG_SET_ORDER)>0)
     {
 
@@ -132 +132 @@
 
       $desc = preg_replace(
-        '/\[gmaps=(?:id:(?<id>\d+);|width:(?<width>\d+);|height:(?<height>\d+);|markerImg:(?<markerImg>[a-z0-9\-\._]+);|kmlId:(?<kmlId>\d+);|kmlUrl:"(?<kmlUrl>.+)";|allowBubble:(?<allowBubble>y|n);|kmlZoom:(?<kmlZoom>y|n);|markerVisible:(?<markerVisible>y|n);)+\]/i',
+        '/\[gmaps=(?:id:(?P<id>\d+);|width:(?P<width>\d+);|height:(?P<height>\d+);|markerImg:(?P<markerImg>[a-z0-9\-\._]+);|kmlId:(?P<kmlId>\d+);|kmlUrl:"(?P<kmlUrl>.+)";|allowBubble:(?P<allowBubble>y|n);|kmlZoom:(?P<kmlZoom>y|n);|markerVisible:(?P<markerVisible>y|n);)+\]/i',
         "<div class='gmapsMarkup' id='gmapsMarkupId$1'></div>", $desc);
 

extensions/GMaps/gmaps_version.inc.php

@@ -15 +15 @@
   if (!defined('PHPWG_ROOT_PATH')) die('Hacking attempt!');
 
-  define('GMAPS_VERSION',  '1.2.1');
-  define('GMAPS_VERSION2', '01.02.01');
+  define('GMAPS_VERSION',  '1.2.2');
+  define('GMAPS_VERSION2', '01.02.02');
   define('GMAPS_GPC_NEEDED', '3.3.2');
   define('GMAPS_AMD_NEEDED', '0.5.2'); //advanced metadata plugin is needed

extensions/GMaps/main.inc.php

@@ -2 +2 @@
 /*
 Plugin Name: GMaps
-Version: 1.2.1
+Version: 1.2.2
 Description: Display and manage (google) maps
 Plugin URI: http://phpwebgallery.net/ext/extension_view.php?eid=454
@@ -75 +75 @@
 |         |            |     kml files
 |         |            |
+| 1.2.2   | 2010-11-02 | * mantis bug:1996
+|         |            |   . Incompatibility with PHP prior than 5.2.2
+|         |            |
+|         |            |
+|         |            |
+|         |            |
+|         |            |