MapPress Easy Google Maps - Version 2.53.5

Version Description

  • Added: curly braces can now be used in mashup queries to pass array parameters
  • Changed: map layout switched to CSS flex
  • Fixed: exclude mashup shortcodes from Gutenberg REST requests
Download this release

Release Info

Developer chrisvrichardson
Plugin Icon 128x128 MapPress Easy Google Maps
Version 2.53.5
Comparing to
See all releases

Code changes from version 2.53.4 to 2.53.5

Files changed (5) hide show
  1. css/mappress.css +4 -1
  2. languages/mappress-google-maps-for-wordpress.pot +6 -6
  3. mappress.php +11 -26
  4. mappress_template.php +1 -1
  5. readme.txt +6 -1
css/mappress.css CHANGED
@@ -30,6 +30,7 @@
30
  }
31
 
32
  .mapp-layout .mapp-main {
 
33
  position: absolute;
34
  top: 0; left: 0; bottom: 0; right: 0;
35
  }
@@ -46,6 +47,7 @@
46
  */
47
 
48
  .mapp-canvas-panel {
 
49
  height: 100%;
50
  margin: 0px;
51
  overflow: hidden !important;
@@ -78,6 +80,7 @@
78
  /* Prevent theme interference with leaflet */
79
  .leaflet-popup-close-button {
80
  box-shadow: none !important; /* 2016, 2017 */
 
81
  }
82
 
83
  a.leaflet-control-zoom-in, .leaflet-control-zoom-out {
@@ -225,7 +228,7 @@ only screen and (min-device-pixel-ratio: 2) {
225
 
226
  .mapp-left .mapp-list {
227
  border-right: 1px solid lightgray;
228
- float: left;
229
  height: 100%;
230
  max-width: 45%;
231
  width: 250px;
30
  }
31
 
32
  .mapp-layout .mapp-main {
33
+ display: flex;
34
  position: absolute;
35
  top: 0; left: 0; bottom: 0; right: 0;
36
  }
47
  */
48
 
49
  .mapp-canvas-panel {
50
+ flex: 1;
51
  height: 100%;
52
  margin: 0px;
53
  overflow: hidden !important;
80
  /* Prevent theme interference with leaflet */
81
  .leaflet-popup-close-button {
82
  box-shadow: none !important; /* 2016, 2017 */
83
+ text-decoration: none !important; /* 2019 */
84
  }
85
 
86
  a.leaflet-control-zoom-in, .leaflet-control-zoom-out {
228
 
229
  .mapp-left .mapp-list {
230
  border-right: 1px solid lightgray;
231
+ /*float: left;*/
232
  height: 100%;
233
  max-width: 45%;
234
  width: 250px;
languages/mappress-google-maps-for-wordpress.pot CHANGED
@@ -2,9 +2,9 @@
2
  # This file is distributed under the same license as the MapPress Maps for WordPress package.
3
  msgid ""
4
  msgstr ""
5
- "Project-Id-Version: MapPress Maps for WordPress 2.53.4\n"
6
  "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/mappress-google-maps-for-wordpress\n"
7
- "POT-Creation-Date: 2020-01-18 03:57:13+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
@@ -122,19 +122,19 @@ msgstr ""
122
  msgid "MapPress Settings"
123
  msgstr ""
124
 
125
- #: mappress.php:315 mappress.php:780
126
  msgid "Version"
127
  msgstr ""
128
 
129
- #: mappress.php:316
130
  msgid "Documentation"
131
  msgstr ""
132
 
133
- #: mappress.php:317
134
  msgid "Support"
135
  msgstr ""
136
 
137
- #: mappress.php:319
138
  msgid "Upgrade to MapPress Pro"
139
  msgstr ""
140
 
2
  # This file is distributed under the same license as the MapPress Maps for WordPress package.
3
  msgid ""
4
  msgstr ""
5
+ "Project-Id-Version: MapPress Maps for WordPress 2.53.5\n"
6
  "Report-Msgid-Bugs-To: https://wordpress.org/support/plugin/mappress-google-maps-for-wordpress\n"
7
+ "POT-Creation-Date: 2020-02-12 23:20:38+00:00\n"
8
  "MIME-Version: 1.0\n"
9
  "Content-Type: text/plain; charset=UTF-8\n"
10
  "Content-Transfer-Encoding: 8bit\n"
122
  msgid "MapPress Settings"
123
  msgstr ""
124
 
125
+ #: mappress.php:314 mappress.php:765
126
  msgid "Version"
127
  msgstr ""
128
 
129
+ #: mappress.php:315
130
  msgid "Documentation"
131
  msgstr ""
132
 
133
+ #: mappress.php:316
134
  msgid "Support"
135
  msgstr ""
136
 
137
+ #: mappress.php:318
138
  msgid "Upgrade to MapPress Pro"
139
  msgstr ""
140
 
mappress.php CHANGED
@@ -4,7 +4,7 @@ Plugin Name: MapPress Maps for WordPress
4
  Plugin URI: https://www.mappresspro.com/mappress
5
  Author URI: https://www.mappresspro.com/chris-contact
6
  Description: MapPress makes it easy to add Google and Leaflet Maps to WordPress
7
- Version: 2.53.4
8
  Author: Chris Richardson
9
  Text Domain: mappress-google-maps-for-wordpress
10
  Thanks to all the translators and to Matthias Stasiak for his wonderful icons (http://code.google.com/p/google-maps-icons/)
@@ -35,7 +35,7 @@ if (is_dir(dirname( __FILE__ ) . '/pro')) {
35
  }
36
 
37
  class Mappress {
38
- const VERSION = '2.53.4';
39
 
40
  static
41
  $baseurl,
@@ -288,12 +288,11 @@ class Mappress {
288
  $mashup = new Mappress_Map($atts);
289
  $mashup->query = Mappress_Query::parse_query($atts);
290
 
291
- // If parameter test="true", output the query result without using a map
292
  if (isset($_GET['mp_test']) || (isset($atts['test']) && $atts['test'])) {
293
- $wpq = new WP_Query($mashup->query);
294
  return "<pre>" . print_r($wpq, true) . "</pre>";
295
  }
296
-
297
  // If using query 'current' then create a static map for current posts
298
  if (empty($mashup->query))
299
  $mashup->pois = Mappress_Query::get_pois($wp_query);
@@ -368,10 +367,11 @@ class Mappress {
368
  update_option('mappress_version', self::VERSION);
369
  }
370
 
371
- // WP returns is_admin() = true during AJAX calls, this one returns false in that case
372
  static function is_admin() {
373
  $ajax = defined('DOING_AJAX') && DOING_AJAX;
374
- return is_admin() && !$ajax;
 
375
  }
376
 
377
  static function is_dev() {
@@ -622,23 +622,13 @@ class Mappress {
622
  }
623
 
624
  /**
625
- * Map a shortcode in a post.
626
  *
627
- * @param mixed $atts - shortcode attributes
628
  */
629
  static function shortcode_map($atts='') {
630
  global $post;
631
 
632
- // No feeds
633
- if (is_feed())
634
- return;
635
-
636
- // No REST requests (e.g. Gutenberg)
637
- if (defined('REST_REQUEST') && REST_REQUEST)
638
- return;
639
-
640
- // Try to protect against calls to do_shortcode() in the post editor...
641
- if (self::is_admin())
642
  return;
643
 
644
  $atts = self::scrub_atts($atts);
@@ -666,16 +656,11 @@ class Mappress {
666
  }
667
 
668
  /**
669
- * Process the mashup shortcode
670
  *
671
  */
672
  static function shortcode_mashup($atts='') {
673
- // No feeds
674
- if (is_feed())
675
- return;
676
-
677
- // Prevent do_shortcode() in the post editor, but allow for AJAX calls from other plugins (which run as admin)
678
- if (self::is_admin())
679
  return;
680
 
681
  $atts = self::scrub_atts($atts);
4
  Plugin URI: https://www.mappresspro.com/mappress
5
  Author URI: https://www.mappresspro.com/chris-contact
6
  Description: MapPress makes it easy to add Google and Leaflet Maps to WordPress
7
+ Version: 2.53.5
8
  Author: Chris Richardson
9
  Text Domain: mappress-google-maps-for-wordpress
10
  Thanks to all the translators and to Matthias Stasiak for his wonderful icons (http://code.google.com/p/google-maps-icons/)
35
  }
36
 
37
  class Mappress {
38
+ const VERSION = '2.53.5';
39
 
40
  static
41
  $baseurl,
288
  $mashup = new Mappress_Map($atts);
289
  $mashup->query = Mappress_Query::parse_query($atts);
290
 
291
+ // If parameter test="true", output the query result (or global query) without using a map
292
  if (isset($_GET['mp_test']) || (isset($atts['test']) && $atts['test'])) {
293
+ $wpq = ($mashup->query) ? new WP_Query($mashup->query) : $wp_query;
294
  return "<pre>" . print_r($wpq, true) . "</pre>";
295
  }
 
296
  // If using query 'current' then create a static map for current posts
297
  if (empty($mashup->query))
298
  $mashup->pois = Mappress_Query::get_pois($wp_query);
367
  update_option('mappress_version', self::VERSION);
368
  }
369
 
370
+ // Prevent shortcodes on admin screens
371
  static function is_admin() {
372
  $ajax = defined('DOING_AJAX') && DOING_AJAX;
373
+ $rest = defined('REST_REQUEST') && REST_REQUEST;
374
+ return (is_admin() && !$ajax) || $rest;
375
  }
376
 
377
  static function is_dev() {
622
  }
623
 
624
  /**
625
+ * Map shortcode
626
  *
 
627
  */
628
  static function shortcode_map($atts='') {
629
  global $post;
630
 
631
+ if (self::is_admin() || is_feed())
 
 
 
 
 
 
 
 
 
632
  return;
633
 
634
  $atts = self::scrub_atts($atts);
656
  }
657
 
658
  /**
659
+ * Mashup shortcode
660
  *
661
  */
662
  static function shortcode_mashup($atts='') {
663
+ if (self::is_admin() || is_feed())
 
 
 
 
 
664
  return;
665
 
666
  $atts = self::scrub_atts($atts);
mappress_template.php CHANGED
@@ -104,7 +104,7 @@ class Mappress_Template extends Mappress_Obj {
104
  static function locate_template($template_name) {
105
  $template_name .= ".php";
106
  $template_file = locate_template($template_name, false);
107
- if (!Mappress::$pro || Mappress::is_admin() || empty($template_file))
108
  $template_file = Mappress::$basedir . "/templates/$template_name";
109
 
110
  // Template exists, return it
104
  static function locate_template($template_name) {
105
  $template_name .= ".php";
106
  $template_file = locate_template($template_name, false);
107
+ if (!Mappress::$pro || is_admin() || empty($template_file))
108
  $template_file = Mappress::$basedir . "/templates/$template_name";
109
 
110
  // Template exists, return it
readme.txt CHANGED
@@ -4,7 +4,7 @@ Donate link: https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_i
4
  Tags: leaflet, openstreetmap, osm, mapbox, map box, google maps,google,map,maps,easy,poi,mapping,mapper,gps,lat,lon,latitude,longitude,geocoder,geocoding,georss,geo rss,geo,v3,marker,mashup,mash,api,v3,buddypress,mashup,geo,wp-geo,geo mashup,simplemap,simple,wpml
5
  Requires at least: 4.5
6
  Tested up to: 5.2
7
- Stable tag: 2.53.4
8
 
9
  == Description ==
10
  MapPress adds beautiful, interactive Google or Leaflet maps to WordPress.
@@ -86,6 +86,11 @@ Please see the plugin documentation pages:
86
 
87
  == Changelog ==
88
 
 
 
 
 
 
89
  = 2.53.4 =
90
  * Added: 'dragging' and 'keyboard' shortcode attributes for Leaflet maps
91
  * Fixed: map shortcode not working in archive text widget
4
  Tags: leaflet, openstreetmap, osm, mapbox, map box, google maps,google,map,maps,easy,poi,mapping,mapper,gps,lat,lon,latitude,longitude,geocoder,geocoding,georss,geo rss,geo,v3,marker,mashup,mash,api,v3,buddypress,mashup,geo,wp-geo,geo mashup,simplemap,simple,wpml
5
  Requires at least: 4.5
6
  Tested up to: 5.2
7
+ Stable tag: 2.53.5
8
 
9
  == Description ==
10
  MapPress adds beautiful, interactive Google or Leaflet maps to WordPress.
86
 
87
  == Changelog ==
88
 
89
+ = 2.53.5 =
90
+ * Added: curly braces can now be used in mashup queries to pass array parameters
91
+ * Changed: map layout switched to CSS flex
92
+ * Fixed: exclude mashup shortcodes from Gutenberg REST requests
93
+
94
  = 2.53.4 =
95
  * Added: 'dragging' and 'keyboard' shortcode attributes for Leaflet maps
96
  * Fixed: map shortcode not working in archive text widget