Skip to content

Commit f52a528

Browse files
authored
fix: shortcode context for components (#902)
1 parent 9d8ee2f commit f52a528

File tree

1 file changed

+9
-0
lines changed

1 file changed

+9
-0
lines changed

source/php/Display.php

Lines changed: 9 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,8 @@ class Display
1818
public $options = null;
1919
private $isBlock = false;
2020
private $isRenderingModule = false;
21+
private $isShortcode = false; // Flag to indicate if the current context is a shortcode.
22+
2123

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

@@ -40,6 +42,10 @@ public function __construct()
4042
$data['isBlock'] = $this->isBlock;
4143
}
4244

45+
if ($this->isShortcode) {
46+
$data['isShortcode'] = true;
47+
}
48+
4349
return $data;
4450
});
4551
}
@@ -773,14 +779,17 @@ public function shortcodeDisplay($args)
773779
$class = \Modularity\ModuleManager::$classes[$module->post_type];
774780
$module = new $class($module, $args);
775781

782+
$this->isShortcode = true;
776783
$moduleMarkup = $this->getModuleMarkup($module, $args);
777784
if (empty($moduleMarkup)) {
785+
$this->isShortcode = false;
778786
return;
779787
}
780788

781789
$moduleMarkup = apply_filters('Modularity/Display/Markup', $moduleMarkup, $module);
782790
$moduleMarkup = apply_filters('Modularity/Display/' . $module->post_type . '/Markup', $moduleMarkup, $module);
783791

792+
$this->isShortcode = false;
784793
return '<div class="' . $module->post_type . '">' . $moduleMarkup . '</div>';
785794
}
786795

0 commit comments

Comments
 (0)