From c41bbb8405bac317851f5612d1de49e8ab64f503 Mon Sep 17 00:00:00 2001
From: NiclasNorin <niclasn@outlook.com>
Date: Thu, 26 Jun 2025 16:34:30 +0200
Subject: [PATCH 1/2] fix: shortcodes rendering module view twice

---
 source/php/Display.php | 5 +++++
 1 file changed, 5 insertions(+)

diff --git a/source/php/Display.php b/source/php/Display.php
index d9f2635c6..efab4e34a 100644
--- a/source/php/Display.php
+++ b/source/php/Display.php
@@ -18,6 +18,7 @@ class Display
     public $options = null;
     private $isBlock = false;
     private $isRenderingModule = false;
+    private static $renderedShortcodeModules = [];
 
     private static $sidebarState = []; //Holds state of sidebars.
 
@@ -761,6 +762,10 @@ public function shortcodeDisplay($args)
             return;
         }
 
+        if (isset(self::$renderedShortcodeModules[$args['id']])) {
+            return self::$renderedShortcodeModules[$args['id']];
+        }
+
         //Get module details
         $module = \Modularity\Editor::getModule($args['id']);
 

From 79b3a5d6868d796635f4909ed5bf55a2a991721c Mon Sep 17 00:00:00 2001
From: NiclasNorin <niclasn@outlook.com>
Date: Thu, 26 Jun 2025 16:37:52 +0200
Subject: [PATCH 2/2] fix: setting cache

---
 source/php/Display.php | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/source/php/Display.php b/source/php/Display.php
index efab4e34a..34ce52710 100644
--- a/source/php/Display.php
+++ b/source/php/Display.php
@@ -785,8 +785,11 @@ public function shortcodeDisplay($args)
 
         $moduleMarkup = apply_filters('Modularity/Display/Markup', $moduleMarkup, $module);
         $moduleMarkup = apply_filters('Modularity/Display/' . $module->post_type . '/Markup', $moduleMarkup, $module);
+        $moduleMarkup = '<div class="' . $module->post_type . '">' . $moduleMarkup . '</div>';
 
-        return '<div class="' . $module->post_type . '">' . $moduleMarkup . '</div>';
+        self::$renderedShortcodeModules[$args['id']] = $moduleMarkup;
+
+        return $moduleMarkup;
     }
 
     /**