summaryrefslogtreecommitdiff
path: root/modules/menu
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2010-02-01 19:19:35 +0000
committerDries Buytaert <dries@buytaert.net>2010-02-01 19:19:35 +0000
commit441ea23bbd2447e75a06622239bf35fe137203de (patch)
tree788219d79e497d94b3aaf0faaa94619b8702d785 /modules/menu
parentdf6ae20b4f60240df1da6b93cd495685d1447276 (diff)
downloadbrdo-441ea23bbd2447e75a06622239bf35fe137203de.tar.gz
brdo-441ea23bbd2447e75a06622239bf35fe137203de.tar.bz2
- Patch #682784 by andrewfn: once created, menu item query strings could never be deleted.
Diffstat (limited to 'modules/menu')
-rw-r--r--modules/menu/menu.admin.inc8
1 files changed, 8 insertions, 0 deletions
diff --git a/modules/menu/menu.admin.inc b/modules/menu/menu.admin.inc
index da28e8fb3..56d9f747b 100644
--- a/modules/menu/menu.admin.inc
+++ b/modules/menu/menu.admin.inc
@@ -348,9 +348,17 @@ function menu_edit_item_validate($form, &$form_state) {
if (isset($parsed_link['query'])) {
$item['options']['query'] = drupal_get_query_array($parsed_link['query']);
}
+ else {
+ // Use unset() rather than setting to empty string
+ // to avoid redundant serialized data being stored.
+ unset($item['options']['query']);
+ }
if (isset($parsed_link['fragment'])) {
$item['options']['fragment'] = $parsed_link['fragment'];
}
+ else {
+ unset($item['options']['fragment']);
+ }
if ($item['link_path'] != $parsed_link['path']) {
$item['link_path'] = $parsed_link['path'];
}