summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorDries Buytaert <dries@buytaert.net>2008-06-24 17:01:33 +0000
committerDries Buytaert <dries@buytaert.net>2008-06-24 17:01:33 +0000
commit81c71bc89142f93addc32c0e8d7f8b906d94d4b4 (patch)
treee6d418f196d4554211992a62f89cf0f5e59db624 /includes
parent21da8b32dc1db9400fb82e2fd5a5beae96df7b45 (diff)
downloadbrdo-81c71bc89142f93addc32c0e8d7f8b906d94d4b4.tar.gz
brdo-81c71bc89142f93addc32c0e8d7f8b906d94d4b4.tar.bz2
- Patch #216515 by chx, Damien Tournoud, et al: fixed form API glitch with caching.
Diffstat (limited to 'includes')
-rw-r--r--includes/form.inc1
-rw-r--r--includes/menu.inc2
2 files changed, 2 insertions, 1 deletions
diff --git a/includes/form.inc b/includes/form.inc
index 94aa380b1..b2472c68e 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -852,6 +852,7 @@ function form_builder($form_id, $form, &$form_state) {
}
if (isset($form['#type']) && $form['#type'] == 'form') {
+ $cache = NULL;
$complete_form = $form;
if (!empty($form['#programmed'])) {
$form_state['submitted'] = TRUE;
diff --git a/includes/menu.inc b/includes/menu.inc
index 2444d122e..9619b3ea1 100644
--- a/includes/menu.inc
+++ b/includes/menu.inc
@@ -622,7 +622,7 @@ function _menu_translate(&$router_item, $map, $to_arg = FALSE) {
$router_item['href'] = implode('/', $link_map);
$router_item['options'] = array();
_menu_check_access($router_item, $map);
-
+
// For performance, don't localize an item the user can't access.
if ($router_item['access']) {
_menu_item_localize($router_item, $map);