adds do_shortcode in add popup to shape (bozdoz#205)

Co-authored-by: bozdoz <[email protected]>
habi · Feb 10, 2023 · 93bb4d9 · 93bb4d9
1 parent 5e52487
commit 93bb4d9
Showing 1 changed file with 12 additions and 6 deletions.
diff --git a/class.leaflet-map.php b/class.leaflet-map.php
@@ -372,20 +372,26 @@ public function add_popup_to_shape($atts, $content, $shape)
 
         $message = empty($message) ? 
             (empty($content) ? '' : $content) : $message;
+
+        if (empty($message)) {
+            return;
+        }
+
+        // execute shortcodes if present:
+        // e.g. [leaflet-marker][some-shortcode][/leaflet-marker]
+        $message = do_shortcode($message);
         $message = str_replace(array("\r\n", "\n", "\r"), '<br>', $message);
         $message = addslashes($message);
         $message = htmlspecialchars($message);
         $visible = empty($visible) 
             ? false 
             : filter_var($visible, FILTER_VALIDATE_BOOLEAN);
 
-        if (!empty($message)) {
-            echo "{$shape}.bindPopup(window.WPLeafletMapPlugin.unescape('{$message}'))";
-            if ($visible) {
-                echo ".openPopup()";
-            }
-            echo ";";
+        echo "{$shape}.bindPopup(window.WPLeafletMapPlugin.unescape('{$message}'))";
+        if ($visible) {
+            echo ".openPopup()";
         }
+        echo ";";
     }
 
     /**