Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 8 additions & 3 deletions source/php/Display.php
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,8 @@ class Display
public $options = null;
private $isBlock = false;
private $isRenderingModule = false;
private static $renderedShortcodeModules = [];
private $isShortcode = false; // Flag to indicate if the current context is a shortcode.


private static $sidebarState = []; //Holds state of sidebars.

public function __construct()
Expand Down Expand Up @@ -767,6 +766,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']);

Expand All @@ -788,9 +791,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>';

self::$renderedShortcodeModules[$args['id']] = $moduleMarkup;
$this->isShortcode = false;
return '<div class="' . $module->post_type . '">' . $moduleMarkup . '</div>';
return $moduleMarkup;
}

/**
Expand Down