diff options
author | Dries Buytaert <dries@buytaert.net> | 2005-12-14 20:10:45 +0000 |
---|---|---|
committer | Dries Buytaert <dries@buytaert.net> | 2005-12-14 20:10:45 +0000 |
commit | 764f1177efe7bafe5ab47b21968d4b0921c3896c (patch) | |
tree | b0d25865abedeed7d251bef5c43857e79bc6f210 /themes | |
parent | e53f58fbe0e6c033fce65bd0d7a76d25911ff158 (diff) | |
download | brdo-764f1177efe7bafe5ab47b21968d4b0921c3896c.tar.gz brdo-764f1177efe7bafe5ab47b21968d4b0921c3896c.tar.bz2 |
- Patch #40631 by Chris Johnson: is_array() slower than isset() or empty().
Diffstat (limited to 'themes')
-rw-r--r-- | themes/bluemarine/page.tpl.php | 4 | ||||
-rw-r--r-- | themes/chameleon/chameleon.theme | 6 | ||||
-rw-r--r-- | themes/pushbutton/page.tpl.php | 4 |
3 files changed, 7 insertions, 7 deletions
diff --git a/themes/bluemarine/page.tpl.php b/themes/bluemarine/page.tpl.php index 3039ce7fb..9683955bf 100644 --- a/themes/bluemarine/page.tpl.php +++ b/themes/bluemarine/page.tpl.php @@ -18,8 +18,8 @@ <?php if ($site_slogan) { ?><div class='site-slogan'><?php print $site_slogan ?></div><?php } ?> </td> <td id="menu"> - <?php if ($secondary_links) { ?><div id="secondary"><?php print theme('links', $secondary_links) ?></div><?php } ?> - <?php if ($primary_links) { ?><div id="primary"><?php print theme('links', $primary_links) ?></div><?php } ?> + <?php if (isset($secondary_links)) { ?><div id="secondary"><?php print theme('links', $secondary_links) ?></div><?php } ?> + <?php if (isset($primary_links)) { ?><div id="primary"><?php print theme('links', $primary_links) ?></div><?php } ?> <?php print $search_box ?> </td> </tr> diff --git a/themes/chameleon/chameleon.theme b/themes/chameleon/chameleon.theme index 0eb915658..54def5f6e 100644 --- a/themes/chameleon/chameleon.theme +++ b/themes/chameleon/chameleon.theme @@ -55,12 +55,12 @@ function chameleon_page($content) { $primary_links = theme('links', menu_primary_links()); $secondary_links = theme('links', menu_secondary_links()); - if ($primary_links || $secondary_links) { + if (isset($primary_links) || isset($secondary_links)) { $output .= ' <div class="navlinks">'; - if ($primary_links) { + if (isset($primary_links)) { $output .= '<div class="primary">'. $primary_links .'</div>'; } - if ($secondary_links) { + if (($secondary_links)) { $output .= '<div class="secondary">'. $secondary_links .'</div>'; } $output .= " </div>\n"; diff --git a/themes/pushbutton/page.tpl.php b/themes/pushbutton/page.tpl.php index e64e8569c..c986023ca 100644 --- a/themes/pushbutton/page.tpl.php +++ b/themes/pushbutton/page.tpl.php @@ -102,12 +102,12 @@ <table id="footer-menu" summary="Navigation elements." border="0" cellpadding="0" cellspacing="0" width="100%"> <tr> <td align="center" valign="middle"> - <?php if (is_array($primary_links)) : ?> + <?php if (isset($primary_links)) : ?> <div class="primary-links"> <?php print theme('links', $primary_links) ?> </div> <?php endif; ?> - <?php if (is_array($secondary_links)) : ?> + <?php if (isset($secondary_links)) : ?> <div class="secondary-links"> <?php print theme('links', $secondary_links) ?> </div> |