From 471a8a1860708e696a886e5bbf4f4b8061afeb84 Mon Sep 17 00:00:00 2001 From: Hassan Khan Date: Mon, 11 Nov 2013 19:12:26 +0000 Subject: [PATCH] Updated ``Zepto\FileLoader\MarkdownLoader`` to not return empty key-values in ``meta`` and updated template check in ``Zepto\Zepto`` --- library/Zepto/FileLoader/MarkdownLoader.php | 2 +- library/Zepto/Zepto.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/library/Zepto/FileLoader/MarkdownLoader.php b/library/Zepto/FileLoader/MarkdownLoader.php index d57e332..08dfce4 100644 --- a/library/Zepto/FileLoader/MarkdownLoader.php +++ b/library/Zepto/FileLoader/MarkdownLoader.php @@ -85,7 +85,7 @@ private function parse_meta($file) $meta[$field] = trim(preg_replace("/\s*(?:\*\/|\?>).*/", '', $match[1])); } else { - $meta[$field] = ''; + unset($meta[$field]); } } diff --git a/library/Zepto/Zepto.php b/library/Zepto/Zepto.php index 4a86aba..e8cdfb0 100644 --- a/library/Zepto/Zepto.php +++ b/library/Zepto/Zepto.php @@ -166,9 +166,9 @@ protected function setup_router() ); // Retrieve template name, if none given, use base template - $template_name = $content['meta']['template'] === '' - ? 'base.twig' - : $content['meta']['template']; + $template_name = array_key_exists('template', $content['meta']) === true + ? $content['meta']['template'] + : 'base.twig'; // Merge Twig options and content into one array $options = array_merge($twig_options, $content);