From 5b59253a6864f6d04e1210332e40488876e8c20c Mon Sep 17 00:00:00 2001 From: Eric Rasmussen <ericrasmussen1@gmail.com> Date: Thu, 15 Nov 2012 15:46:55 -0600 Subject: [PATCH] [gh-541] Check isset for $page keys in unl_wdn's page.tpl.php --- sites/all/themes/unl_wdn/page.tpl.php | 20 ++++++++++---------- 1 file changed, 10 insertions(+), 10 deletions(-) diff --git a/sites/all/themes/unl_wdn/page.tpl.php b/sites/all/themes/unl_wdn/page.tpl.php index edf87ebac..39e8df5bb 100644 --- a/sites/all/themes/unl_wdn/page.tpl.php +++ b/sites/all/themes/unl_wdn/page.tpl.php @@ -79,9 +79,9 @@ if (isset($breadcrumb)) { $t->navlinks = PHP_EOL . render($page['navlinks']); // Site Title and Page Title -if (isset($site_name) && $site_name) { - if (theme_get_setting('site_name_abbreviation')) { - $t->titlegraphic = '<abbr title="' . $site_name . '">' +if (isset($site_name) && !empty($site_name)) { + if (theme_get_setting('site_name_abbreviation')) { + $t->titlegraphic = '<abbr title="' . $site_name . '">' . theme_get_setting('site_name_abbreviation') . '</abbr>'; } @@ -92,7 +92,7 @@ if (isset($site_name) && $site_name) { $t->titlegraphic .= '<span>' . $site_slogan . '</span>'; } } -if (isset($title) && $title) { +if (isset($title) && !empty($title)) { $t->pagetitle = '<h1>' . render($title_prefix) . $title . render($title_suffix) . '</h1>'; } @@ -107,31 +107,31 @@ else { . render($action_links) . PHP_EOL; } -if ($page['sidebar_first']) { +if (isset($page['sidebar_first'])) { $t->maincontentarea .= render($page['sidebar_first']) . PHP_EOL; } $t->maincontentarea .= render($page['content']) . PHP_EOL; -if ($page['sidebar_second']) { +if (isset($page['sidebar_second'])) { $t->maincontentarea .= render($page['sidebar_second']) . PHP_EOL; } // Related Links -if ($page['leftcollinks']) { +if (isset($page['leftcollinks'])) { $t->leftcollinks = render($page['leftcollinks']); } // Contact Us -if ($page['contactinfo']) { +if (isset($page['contactinfo'])) { $t->contactinfo = render($page['contactinfo']); } // Optional Footer -if ($page['optionalfooter']) { +if (isset($page['optionalfooter'])) { $t->optionalfooter = render($page['optionalfooter']); } // Copyright Area -if ($page['footercontent']) { +if (isset($page['footercontent'])) { $t->footercontent = PHP_EOL.render($page['footercontent']); } $t->footercontent = preg_replace(array('/©\s*[0-9]{4}/', '/©\s*[0-9]{4}/'), '© ' . date('Y'), $t->footercontent); -- GitLab