summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorGerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org>2006-04-07 15:18:40 +0000
committerGerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org>2006-04-07 15:18:40 +0000
commit77dc67ec9218b9eb6dd8a88f8d81d15312ce3d3c (patch)
treec763c422776504c2982e7e195e0a08ac4d4849d7 /includes
parent27e562e3908c16dc501a60050e4e53513f6e6ebe (diff)
downloadbrdo-77dc67ec9218b9eb6dd8a88f8d81d15312ce3d3c.tar.gz
brdo-77dc67ec9218b9eb6dd8a88f8d81d15312ce3d3c.tar.bz2
#56415, menu_set_location (menu_set_active) mangles $_GET/arg(), patch by JonBob
Diffstat (limited to 'includes')
-rw-r--r--includes/menu.inc4
1 files changed, 4 insertions, 0 deletions
diff --git a/includes/menu.inc b/includes/menu.inc
index 661f9db88..b43042d01 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -328,6 +328,10 @@ function menu_set_location($location) {
$temp_id = min(array_keys($_menu['items'])) - 1;
$prev_id = 0;
+ // Don't allow this function to change the actual current path, just the
+ // position in the menu tree.
+ $location[count($location) - 1]['path'] = $_GET['q'];
+
foreach (array_reverse($location) as $item) {
if (isset($_menu['path index'][$item['path']])) {
$mid = $_menu['path index'][$item['path']];