From 9339ea12c60e54c8d73d2d586ba525ced33a35e1 Mon Sep 17 00:00:00 2001
From: Skylar Ittner <admin@netsyms.com>
Date: Thu, 24 May 2018 14:56:07 -0600
Subject: [PATCH] Fix theme bugs where complex JSON is echoed twice

---
 public/themes/bootstrap/contact.php  | 2 +-
 public/themes/hyperspace/default.php | 2 +-
 public/themes/identity/contact.php   | 2 +-
 public/themes/verti/contact.php      | 2 +-
 public/themes/verti/home.php         | 8 ++++----
 5 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/public/themes/bootstrap/contact.php b/public/themes/bootstrap/contact.php
index 2d84447..cbd7c70 100644
--- a/public/themes/bootstrap/contact.php
+++ b/public/themes/bootstrap/contact.php
@@ -37,7 +37,7 @@ include __DIR__ . "/inc/header.inc.php";
             $icon = $btn['icon'];
             $text = $btn['text'];
             ?>
-            <button type="submit" class="btn btn-primary sw-complex" data-json="<?php echo get_escaped_json($btn); ?>" data-component="submit-btn">
+            <button type="submit" class="btn btn-primary sw-complex" data-json="<?php get_escaped_json($btn); ?>" data-component="submit-btn">
                 <i class="<?php echo $icon; ?>"></i> <?php echo $text; ?>
             </button>
         </form>
diff --git a/public/themes/hyperspace/default.php b/public/themes/hyperspace/default.php
index d787091..83820d9 100644
--- a/public/themes/hyperspace/default.php
+++ b/public/themes/hyperspace/default.php
@@ -12,7 +12,7 @@ include __DIR__ . "/inc/header.inc.php";
             <?php
             $image = get_complex_component("page-image", null, ['image']);
             ?>
-            <span class="image fit sw-complex" data-json="<?php echo get_escaped_json($image); ?>" data-component="page-image">
+            <span class="image fit sw-complex" data-json="<?php get_escaped_json($image); ?>" data-component="page-image">
                 <img src="<?php get_file_url($image['image']); ?>" alt="" />
             </span>
             <div class="sw-editable" data-component="content">
diff --git a/public/themes/identity/contact.php b/public/themes/identity/contact.php
index a2bffa5..7d8a613 100644
--- a/public/themes/identity/contact.php
+++ b/public/themes/identity/contact.php
@@ -22,7 +22,7 @@ include __DIR__ . "/inc/header.inc.php";
             $icon = $btn['icon'];
             $text = $btn['text'];
             ?>
-            <button type="submit" class="button sw-complex" data-json="<?php echo get_escaped_json($btn); ?>" data-component="submit-btn">
+            <button type="submit" class="button sw-complex" data-json="<?php get_escaped_json($btn); ?>" data-component="submit-btn">
                 <i class="<?php echo $icon; ?>"></i> <?php echo $text; ?>
             </button>
         </li>
diff --git a/public/themes/verti/contact.php b/public/themes/verti/contact.php
index 9972253..bbc9cbc 100644
--- a/public/themes/verti/contact.php
+++ b/public/themes/verti/contact.php
@@ -39,7 +39,7 @@
                             $icon = $btn['icon'];
                             $text = $btn['text'];
                             ?>
-                            <button type="submit" class="button icon <?php echo $icon; ?> sw-complex" data-json="<?php echo get_escaped_json($btn); ?>" data-component="submit-btn">
+                            <button type="submit" class="button icon <?php echo $icon; ?> sw-complex" data-json="<?php get_escaped_json($btn); ?>" data-component="submit-btn">
                                 <?php echo $text; ?>
                             </button>
                         </form>
diff --git a/public/themes/verti/home.php b/public/themes/verti/home.php
index 879c15a..f3b3a0f 100644
--- a/public/themes/verti/home.php
+++ b/public/themes/verti/home.php
@@ -21,7 +21,7 @@
                                     $link = $btn['link'];
                                     $text = $btn['text'];
                                     ?>
-                                    <a href="<?php get_url_or_slug($link); ?>" class="button big icon <?php echo $icon; ?> sw-complex" data-json="<?php echo get_escaped_json($btn); ?>" data-component="banner-btn-1">
+                                    <a href="<?php get_url_or_slug($link); ?>" class="button big icon <?php echo $icon; ?> sw-complex" data-json="<?php get_escaped_json($btn); ?>" data-component="banner-btn-1">
                                         <?php echo $text; ?>
                                     </a>
                                 <?php } ?>
@@ -34,7 +34,7 @@
                                     $link = $btn['link'];
                                     $text = $btn['text'];
                                     ?>
-                                    <a href="<?php get_url_or_slug($link); ?>" class="button alt big icon <?php echo $icon; ?> sw-complex" data-json="<?php echo get_escaped_json($btn); ?>" data-component="banner-btn-2">
+                                    <a href="<?php get_url_or_slug($link); ?>" class="button alt big icon <?php echo $icon; ?> sw-complex" data-json="<?php get_escaped_json($btn); ?>" data-component="banner-btn-2">
                                         <?php echo $text; ?>
                                     </a>
                                 <?php } ?>
@@ -108,7 +108,7 @@ END;
                                     $link = $btn['link'];
                                     $text = $btn['text'];
                                     ?>
-                                    <a href="<?php get_url_or_slug($link); ?>" class="button icon <?php echo $icon; ?> sw-complex" data-json="<?php echo get_escaped_json($btn); ?>" data-component="sidebar-btn">
+                                    <a href="<?php get_url_or_slug($link); ?>" class="button icon <?php echo $icon; ?> sw-complex" data-json="<?php get_escaped_json($btn); ?>" data-component="sidebar-btn">
                                         <?php echo $text; ?>
                                     </a>
                                 <?php } ?>
@@ -132,7 +132,7 @@ END;
                                     $link = $btn['link'];
                                     $text = $btn['text'];
                                     ?>
-                                    <a href="<?php get_url_or_slug($link); ?>" class="button icon <?php echo $icon; ?> sw-complex" data-json="<?php echo get_escaped_json($btn); ?>" data-component="two-btn">
+                                    <a href="<?php get_url_or_slug($link); ?>" class="button icon <?php echo $icon; ?> sw-complex" data-json="<?php get_escaped_json($btn); ?>" data-component="two-btn">
                                         <?php echo $text; ?>
                                     </a>
                                 <?php } ?>