Updated Zepto\FileLoader\MarkdownLoader to not return empty key-v…

…alues in ``meta`` and updated template check in ``Zepto\Zepto``
hassankhan · Nov 11, 2013 · 471a8a1 · 471a8a1
1 parent 12c9535
commit 471a8a1
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git 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
@@ -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);