summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2001-01-04 21:17:07 +0000
committerDries Buytaert <dries@buytaert.net>2001-01-04 21:17:07 +0000
commitdb0c9420a32586e795ec046f0a5c7b2137151b54 (patch)
treea12277c73df771e5630ab6dfe7c9aac00e52cf6d /includes
parent2e495b7d0e5ee69333426a8628bad549c37c699a (diff)
downloadbrdo-db0c9420a32586e795ec046f0a5c7b2137151b54.tar.gz
brdo-db0c9420a32586e795ec046f0a5c7b2137151b54.tar.bz2
- fixed small flaw that showed up with PHP 4.0.0-rcxx but not with PHP 4.0.4
Diffstat (limited to 'includes')
-rw-r--r--includes/theme.inc2
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/theme.inc b/includes/theme.inc
index 25dbe13ad..e8b69c1d6 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -12,7 +12,7 @@ function theme_account($theme) {
function menu($name, $module) {
global $menu;
- if ($module["menu"]) $menu = array_merge($menu, $module["menu"]());
+ if ($module["menu"]) $menu = ($menu) ? array_merge($menu, $module["menu"]()) : $module["menu"]();
}
module_iterate("menu");