Changeset 3035581

Timestamp:

02/14/2024 11:00:32 AM (2 years ago)

Author:

clicksports

Message:

Update 1.3.8

Location:

clicksports-maps/trunk

Files:

• README.txt (modified) (2 diffs)
• admin/class-clicksports-maps-admin.php (modified) (1 diff)
• clicksports-maps.php (modified) (2 diffs)
• includes/class-clicksports-maps.php (modified) (1 diff)
• public/class-clicksports-maps-public.php (modified) (2 diffs)

clicksports-maps/trunk/README.txt

@@ -5 +5 @@
 Requires at least: 4.8
 Tested up to: 6.4
-Stable tag: 1.3.7
+Stable tag: 1.3.8
 License: GPLv2 or later
 License URI: http://www.gnu.org/licenses/gpl-2.0.html
@@ -90 +90 @@
 == Changelog ==
 
+= 1.3.8 =
+* Fixed: Added fallback for unrecognized map theme with shortcode usage.
+* Fixed: Miscellaneous minor fixes.
+
 = 1.3.7 =
 * Changed: Minor additions to descriptions and translations.

clicksports-maps/trunk/admin/class-clicksports-maps-admin.php

@@ -248 +248 @@
         $output .= '</select>';
 
-        $existingThemes = json_decode( file_get_contents('https://maps.clicksports.de/styles.json' ) );
-        foreach( $existingThemes as $existingTheme ) {
-            $themes[] = $existingTheme;
-        }
-
         $output .= '<h3>' . esc_html__( 'Map Theme', 'clicksports-maps' ) . '</h3>';
         $output .= '<select name="clicksports-maps[maptheme]" class="clicksports-maps-admin-select">';
 
         /**
-         * Removed server-side collection of themes:
-         *
-         *  foreach( $themes as $theme ) {
-         *      $output .= '<option value="' . esc_attr( $theme->id ) . '" ' . selected( $theme->id, $settings['maptheme'], false ) . '>' . esc_html__( $theme->name ) . '</option>';
-         *  }
-         *
-         * @since   1.1.1
+         * @update  1.1.1
+         * Removed server-side collection of themes.
+         * ---
+         *
+         * foreach( $themes as $theme ) {
+         *     $output .= '<option value="' . esc_attr( $theme->id ) . '" ' . selected( $theme->id, $settings['maptheme'], false ) . '>' . esc_html__( $theme->name ) . '</option>';
+         * }
+         *
+         * @update  1.3.8
+         * Removed leftover code.
+         * ---
+         *
+         * $existingThemes = json_decode( file_get_contents('https://maps.clicksports.de/styles.json' ) );
+         * foreach( $existingThemes as $existingTheme ) {
+         *     $themes[] = $existingTheme;
+         * }
          */
 

clicksports-maps/trunk/clicksports-maps.php

@@ -16 +16 @@
  * Plugin Name:       CLICKSPORTS Maps
  * Description:       This plugin is a simple alternative to Google Maps and displays a customizable map on your website.
- * Version:           1.3.7
+ * Version:           1.3.8
  * Author:            CLICKSPORTS
  * Author URI:        https://www.clicksports.de
@@ -38 +38 @@
  * Rename this for your plugin and update it as you release new versions.
  */
-define( 'CLICKSPORTS_MAPS_VERSION', '1.3.7' );
+define( 'CLICKSPORTS_MAPS_VERSION', '1.3.8' );
 
 /**

clicksports-maps/trunk/includes/class-clicksports-maps.php

@@ -57 +57 @@
             $this->version = CLICKSPORTS_MAPS_VERSION;
         } else {
-            $this->version = '1.3.7';
+            $this->version = '1.3.8';
         }
         $this->plugin_name = 'clicksports-maps';

clicksports-maps/trunk/public/class-clicksports-maps-public.php

@@ -316 +316 @@
         }
 
+        /**
+         * @update 1.3.8
+         *
+         * If the map theme given in the shortcode is not one of the existing themes,
+         * we fall back to the map theme set in the global settings.
+         */
         if( isset( $atts['maptheme'] ) ) {
-            $settings['maptheme'] = $atts['maptheme'];
+            if( preg_match('/\b(basic|klokantech-basic|positron)\b/', $atts['maptheme']) ) {
+                $settings['maptheme'] = $atts['maptheme'];
+            }
         }
 
@@ -370 +378 @@
          *
          * @update  1.3.4
+         *
          * Use of htmlspecialchars() to prevent broken strings when using link attributes with double quotes in markers.
          */