Merge pull request #437 from infinum/fix/featching-theme-options-ids-…

…for-templates Fix fetching of ids for partials of provided templates
infinum · Nov 21, 2024 · 7a6425e · 7a6425e
2 parents c7c54bd + 9ccf913
commit 7a6425e
Show file tree

Hide file tree

Showing 4 changed files with 23 additions and 6 deletions.
diff --git a/src/InitSetup/tailwind/theme/404.php b/src/InitSetup/tailwind/theme/404.php
@@ -11,7 +11,6 @@
 get_header();
 
 // Header reusable block.
-$partialId = get_option(ThemeOptions::OPTION_NAME)['fourOhFour'] ?? '';
-ThemeOptions::renderPartial($partialId);
+ThemeOptions::renderPartial(ThemeOptions::getOption('fourOhFour'));
 
 get_footer();
diff --git a/src/InitSetup/tailwind/theme/footer.php b/src/InitSetup/tailwind/theme/footer.php
@@ -15,8 +15,7 @@
 <footer class="layout-base">
 <?php
 // Footer reusable block.
-$footerPartialId = get_option(ThemeOptions::OPTION_NAME)['footer'] ?? '';
-ThemeOptions::renderPartial($footerPartialId);
+ThemeOptions::renderPartial(ThemeOptions::getOption('footer'));
 ?>
 </footer>
 

diff --git a/src/InitSetup/tailwind/theme/header.php b/src/InitSetup/tailwind/theme/header.php
@@ -24,8 +24,7 @@
 
 <?php
 // Header reusable block.
-$headerPartialId = get_option(ThemeOptions::OPTION_NAME)['header'] ?? '';
-ThemeOptions::renderPartial($headerPartialId);
+ThemeOptions::renderPartial(ThemeOptions::getOption('header'));
 ?>
 
 <main class="main-content layout-base" id="main-content">
diff --git a/src/ThemeOptions/ThemeOptionsExample.php b/src/ThemeOptions/ThemeOptionsExample.php
@@ -89,6 +89,26 @@ static function ($block) {
 		echo Helpers::ensureString($blocksToRenderRendered); // phpcs:ignore
 	}
 
+	/**
+	 * Get theme option.
+	 *
+	 * @param string $item Item to get.
+	 *
+	 * @return string
+	 */
+	public static function getOption(string $item): string
+	{
+		$options = \get_option(ThemeOptions::OPTION_NAME);
+
+		if (!Helpers::isJson($options)) {
+			return '';
+		}
+
+		$options = \json_decode($options, true);
+
+		return $options[$item] ?? '';
+	}
+
 	/**
 	 * Get reusable blocks patterns.
 	 *