From d3940eafd9c0b9c76571258f9a412d8c89bfb485 Mon Sep 17 00:00:00 2001 From: Cameron Date: Fri, 21 Feb 2014 06:30:25 -0800 Subject: [PATCH] Avoid checking _header_ and _footer_ layouts for divider shortcode. ie. {---} --- e107_core/templates/header_default.php | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/e107_core/templates/header_default.php b/e107_core/templates/header_default.php index ddc59ca0a..d1b653424 100644 --- a/e107_core/templates/header_default.php +++ b/e107_core/templates/header_default.php @@ -580,9 +580,21 @@ echo "\n"; { foreach($LAYOUT as $key=>$template) { - list($hd,$ft) = explode("{---}",$template); - $HEADER[$key] = isset($LAYOUT['_header_']) ? $LAYOUT['_header_'] . $hd : $hd; - $FOOTER[$key] = isset($LAYOUT['_footer_']) ? $ft . $LAYOUT['_footer_'] : $ft ; + if($key == '_header_' || $key == '_footer_') + { + continue; + } + + if(strpos($template,'{---}') !==false) + { + list($hd,$ft) = explode("{---}",$template); + $HEADER[$key] = isset($LAYOUT['_header_']) ? $LAYOUT['_header_'] . $hd : $hd; + $FOOTER[$key] = isset($LAYOUT['_footer_']) ? $ft . $LAYOUT['_footer_'] : $ft ; + } + else + { + e107::getMessage()->addDebug('Missing "{---}" in $LAYOUT["'.$key.'"] '); + } } unset($hd,$ft); }