WP Google Maps - Version 6.0.7

Version Description

  • Upgrading of plugin is now handled correctly
Download this release

Release Info

Developer WPGMaps
Plugin Icon 128x128 WP Google Maps
Version 6.0.7
Comparing to
See all releases

Code changes from version 6.0.6 to 6.0.7

Files changed (4) hide show
  1. cache/timthumb_cacheLastCleanTime.touch +0 -0
  2. cache/timthumb_int_b955650dade17d8e6d4dfe0edf63e0ad.timthumb.txt +0 -0
  3. readme.txt +3 -0
  4. wpGoogleMaps.php +34 -17
cache/timthumb_cacheLastCleanTime.touch DELETED
File without changes
cache/timthumb_int_b955650dade17d8e6d4dfe0edf63e0ad.timthumb.txt DELETED
Binary file
readme.txt CHANGED
@@ -99,6 +99,9 @@ Previous versions may cause your blog to slow down. Upgrading to 4.5 will get ri
99
 
100
  == Changelog ==
101
 
 
 
 
102
  = 6.0.6 =
103
  * Multisite bug fixes
104
  * XML marker file bug fixes (thank you Endymion00)
99
 
100
  == Changelog ==
101
 
102
+ = 6.0.7 =
103
+ * Upgrading of plugin is now handled correctly
104
+
105
  = 6.0.6 =
106
  * Multisite bug fixes
107
  * XML marker file bug fixes (thank you Endymion00)
wpGoogleMaps.php CHANGED
@@ -3,12 +3,15 @@
3
  Plugin Name: WP Google Maps
4
  Plugin URI: http://www.wpgmaps.com
5
  Description: The easiest to use Google Maps plugin! Create custom Google Maps with high quality markers containing locations, descriptions, images and links. Add your customized map to your WordPress posts and/or pages quickly and easily with the supplied shortcode. No fuss.
6
- Version: 6.0.6
7
  Author: WP Google Maps
8
  Author URI: http://www.wpgmaps.com
9
  */
10
 
11
  /*
 
 
 
12
  * 6.0.6
13
  * Multisite bug fixes
14
  *
@@ -72,8 +75,8 @@ $wpgmza_tblname_poly = $wpdb->prefix . "wpgmza_polygon";
72
  $wpgmza_tblname_polylines = $wpdb->prefix . "wpgmza_polylines";
73
  $wpgmza_tblname_categories = $wpdb->prefix. "wpgmza_categories";
74
  $wpgmza_tblname_category_maps = $wpdb->prefix. "wpgmza_category_maps";
75
- $wpgmza_version = "6.0.6";
76
- $wpgmza_p_version = "6.0.6";
77
  $wpgmza_t = "basic";
78
  define("WPGMAPS", $wpgmza_version);
79
  define("WPGMAPS_DIR",plugin_dir_url(__FILE__));
@@ -204,16 +207,42 @@ function wpgmaps_activate() {
204
  if (!$results) { $rows_affected = $wpdb->insert( $table_name, array( 'map_id' => '1', 'address' => 'London', 'lat' => '51.5081290', 'lng' => '-0.1280050', 'pic' => '', 'link' => '', 'icon' => '', 'anim' => '', 'title' => '', 'infoopen' => '', 'description' => '') ); }
205
 
206
  wpgmaps_update_all_xml_file();
 
207
 
208
  //wpgmaps_update_all_xml_file();
209
  }
210
  function wpgmaps_deactivate() { /* wpgmza_cURL_response("deactivate"); */ }
211
  function wpgmaps_init() {
 
 
212
  wp_enqueue_script("jquery");
213
  $plugin_dir = basename(dirname(__FILE__))."/languages/";
214
  load_plugin_textdomain( 'wp-google-maps', false, $plugin_dir );
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
 
215
 
216
- global $wpgmza_pro_version;
217
  if ($wpgmza_pro_version == '5.13' || $wpgmza_pro_version == '5.12' || $wpgmza_pro_version == '5.11' || $wpgmza_pro_version == '5.10') {
218
  if (isset($_GET['page']) && $_GET['page'] == 'wp-google-maps-menu') {
219
  echo "<div id='message' class='updated' style='padding:10px; '><span style='font-weight:bold; color:red;'>Please update your WP Google Maps Pro to version 5.16 or higher. You can do this by going to 'Dashboard'->'Updates' and updating the plugin.</div>";
@@ -1794,19 +1823,7 @@ function wpgmaps_get_plugin_url() {
1794
  function wpgmaps_head() {
1795
  global $wpgmza_tblname_maps;
1796
  global $wpgmza_version;
1797
- if (isset($_GET['page']) && $_GET['page'] == 'wp-google-maps-menu') {
1798
- $wpgmza_first_time = get_option("WPGMZA_FIRST_TIME");
1799
- if (!isset($wpgmza_first_time) || $wpgmza_first_time != $wpgmza_version) {
1800
- /* show welcome screen */
1801
- $wpgmza_first_time = $wpgmza_version;
1802
- update_option("WPGMZA_FIRST_TIME",$wpgmza_first_time);
1803
- wp_redirect(get_option('siteurl')."/wp-admin/admin.php?page=wp-google-maps-menu&action=welcome_page");
1804
- exit();
1805
- //echo "<script>window.location = \"".get_option('siteurl')."/wp-admin/admin.php?page=wp-google-maps-menu&action=welcome_page\"</script>";
1806
-
1807
- }
1808
-
1809
- }
1810
 
1811
  if (isset($_POST['wpgmza_savemap'])){
1812
  global $wpdb;
3
  Plugin Name: WP Google Maps
4
  Plugin URI: http://www.wpgmaps.com
5
  Description: The easiest to use Google Maps plugin! Create custom Google Maps with high quality markers containing locations, descriptions, images and links. Add your customized map to your WordPress posts and/or pages quickly and easily with the supplied shortcode. No fuss.
6
+ Version: 6.0.7
7
  Author: WP Google Maps
8
  Author URI: http://www.wpgmaps.com
9
  */
10
 
11
  /*
12
+ * 6.0.7
13
+ * Upgrades are now handled correctly
14
+ *
15
  * 6.0.6
16
  * Multisite bug fixes
17
  *
75
  $wpgmza_tblname_polylines = $wpdb->prefix . "wpgmza_polylines";
76
  $wpgmza_tblname_categories = $wpdb->prefix. "wpgmza_categories";
77
  $wpgmza_tblname_category_maps = $wpdb->prefix. "wpgmza_category_maps";
78
+ $wpgmza_version = "6.0.7";
79
+ $wpgmza_p_version = "6.0.7";
80
  $wpgmza_t = "basic";
81
  define("WPGMAPS", $wpgmza_version);
82
  define("WPGMAPS_DIR",plugin_dir_url(__FILE__));
207
  if (!$results) { $rows_affected = $wpdb->insert( $table_name, array( 'map_id' => '1', 'address' => 'London', 'lat' => '51.5081290', 'lng' => '-0.1280050', 'pic' => '', 'link' => '', 'icon' => '', 'anim' => '', 'title' => '', 'infoopen' => '', 'description' => '') ); }
208
 
209
  wpgmaps_update_all_xml_file();
210
+ add_option("wpgmaps_current_version",$wpgmza_version);
211
 
212
  //wpgmaps_update_all_xml_file();
213
  }
214
  function wpgmaps_deactivate() { /* wpgmza_cURL_response("deactivate"); */ }
215
  function wpgmaps_init() {
216
+ global $wpgmza_pro_version;
217
+ global $wpgmza_version;
218
  wp_enqueue_script("jquery");
219
  $plugin_dir = basename(dirname(__FILE__))."/languages/";
220
  load_plugin_textdomain( 'wp-google-maps', false, $plugin_dir );
221
+
222
+
223
+ /* handle first time users and updates */
224
+ if (isset($_GET['page']) && $_GET['page'] == 'wp-google-maps-menu') {
225
+ $wpgmza_first_time = get_option("WPGMZA_FIRST_TIME");
226
+ if (!isset($wpgmza_first_time) || $wpgmza_first_time != $wpgmza_version) {
227
+ /* show welcome screen */
228
+ $wpgmza_first_time = $wpgmza_version;
229
+ update_option("WPGMZA_FIRST_TIME",$wpgmza_first_time);
230
+ wp_redirect(get_option('siteurl')."/wp-admin/admin.php?page=wp-google-maps-menu&action=welcome_page");
231
+ exit();
232
+ //echo "<script>window.location = \"".get_option('siteurl')."/wp-admin/admin.php?page=wp-google-maps-menu&action=welcome_page\"</script>";
233
+ }
234
+ }
235
+
236
+ /* check if version is outdated or plugin is being automatically updated */
237
+ $current_version = get_option("wpgmaps_current_version");
238
+ if (!isset($current_version) || $current_version != $wpgmza_version) {
239
+ wpgmaps_handle_db();
240
+ wpgmaps_handle_directory();
241
+ wpgmaps_update_all_xml_file();
242
+ update_option("wpgmaps_current_version",$wpgmza_version);
243
+
244
+ }
245
 
 
246
  if ($wpgmza_pro_version == '5.13' || $wpgmza_pro_version == '5.12' || $wpgmza_pro_version == '5.11' || $wpgmza_pro_version == '5.10') {
247
  if (isset($_GET['page']) && $_GET['page'] == 'wp-google-maps-menu') {
248
  echo "<div id='message' class='updated' style='padding:10px; '><span style='font-weight:bold; color:red;'>Please update your WP Google Maps Pro to version 5.16 or higher. You can do this by going to 'Dashboard'->'Updates' and updating the plugin.</div>";
1823
  function wpgmaps_head() {
1824
  global $wpgmza_tblname_maps;
1825
  global $wpgmza_version;
1826
+
 
 
 
 
 
 
 
 
 
 
 
 
1827
 
1828
  if (isset($_POST['wpgmza_savemap'])){
1829
  global $wpdb;