diff --git a/includes/view.inc b/includes/view.inc index d082a0b..73bcf5a 100644 --- a/includes/view.inc +++ b/includes/view.inc @@ -2021,7 +2021,7 @@ class view extends views_db_object { unset($this->query); } - $keys = array('current_display', 'display_handler', 'build_info', 'built', 'executed', 'attachment_before', 'attachment_after', 'field', 'argument', 'filter', 'sort', 'relationship', 'header', 'footer', 'empty', 'query', 'result', 'inited', 'style_plugin', 'plugin_name', 'exposed_data', 'exposed_input', 'many_to_one_tables'); + $keys = array('current_display', 'display_handler', 'build_info', 'built', 'executed', 'attachment_before', 'attachment_after', 'field', 'argument', 'filter', 'sort', 'relationship', 'header', 'footer', 'empty', 'query', 'result', 'inited', 'style_plugin', 'plugin_name', 'exposed_data', 'exposed_input', 'many_to_one_tables', 'dom_id'); foreach ($keys as $key) { if (isset($this->$key)) { unset($this->$key); diff --git a/views.module b/views.module index 9cdcfb5..4c96c8c 100644 --- a/views.module +++ b/views.module @@ -1985,7 +1985,7 @@ function views_exposed_form($form, &$form_state) { // Let form plugins know this is for exposed widgets. $form_state['exposed'] = TRUE; // Check if the form was already created - if ($cache = views_exposed_form_cache($view->name, $view->current_display)) { + if ($cache = views_exposed_form_cache($view->name, $view->current_display . '-' . $view->dom_id)) { return $cache; } @@ -2030,7 +2030,7 @@ function views_exposed_form($form, &$form_state) { $form['#action'] = url($view->display_handler->get_url()); $form['#theme'] = views_theme_functions('views_exposed_form', $view, $display); - $form['#id'] = drupal_clean_css_identifier('views_exposed_form-' . check_plain($view->name) . '-' . check_plain($display->id)); + $form['#id'] = drupal_clean_css_identifier('views_exposed_form-' . check_plain($view->name) . '-' . check_plain($display->id) . '-' . check_plain($view->dom_id)); // $form['#attributes']['class'] = array('views-exposed-form'); // If using AJAX, we need the form plugin. @@ -2043,7 +2043,7 @@ function views_exposed_form($form, &$form_state) { $exposed_form_plugin->exposed_form_alter($form, $form_state); // Save the form - views_exposed_form_cache($view->name, $view->current_display, $form); + views_exposed_form_cache($view->name, $view->current_display . '-' . $view->dom_id, $form); return $form; }