diff options
| author | Dries Buytaert <dries@buytaert.net> | 2004-10-12 20:20:28 +0000 |
|---|---|---|
| committer | Dries Buytaert <dries@buytaert.net> | 2004-10-12 20:20:28 +0000 |
| commit | 306cfdf17a7aaa4ef4465d7b8779a39c3ddab429 (patch) | |
| tree | 526eff21cd11900e9ef3199fd07c937fbc22694e /includes | |
| parent | 2510f322a183acd4040748ce9905d08de59fecb1 (diff) | |
| download | brdo-306cfdf17a7aaa4ef4465d7b8779a39c3ddab429.tar.gz brdo-306cfdf17a7aaa4ef4465d7b8779a39c3ddab429.tar.bz2 | |
- Patch #9292 by Gerhard: fixed another array_merge + PHP5 woe.
Diffstat (limited to 'includes')
| -rw-r--r-- | includes/menu.inc | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/includes/menu.inc b/includes/menu.inc index 889828d8e..ff34e370f 100644 --- a/includes/menu.inc +++ b/includes/menu.inc @@ -346,7 +346,7 @@ function menu_execute_active_handler() { $arguments = array_key_exists('callback arguments', $menu['items'][$mid]) ? $menu['items'][$mid]['callback arguments'] : array(); $arg = substr($_GET['q'], strlen($menu['items'][$mid]['path']) + 1); if (strlen($arg)) { - $arguments = array_merge($arguments, explode('/', $arg)); + $arguments = array_merge(array($arguments), explode('/', $arg)); } call_user_func_array($menu['items'][$mid]['callback'], $arguments); return MENU_FOUND; |