diff --git a/includes/convert.inc b/includes/convert.inc index b4934d0..bd7a3bc 100644 --- a/includes/convert.inc +++ b/includes/convert.inc @@ -351,17 +351,24 @@ function views1_import($imported) { module_invoke($module, 'views_convert', 'default', 'argument', $view, $field, NULL); } } - foreach ($imported->filter as $field) { + foreach ($imported->filter as $key => $field) { $options = $field['value'] == '' ? array() : array('value' => $field['value']); $id = $view->add_item('default', 'filter', $field['tablename'], $field['field'], $options); foreach (module_implements('views_convert') as $module) { module_invoke($module, 'views_convert', 'default', 'filter', $view, $field, $id); } + // Store the id in the exposed filter if there is one. + foreach ($imported->exposed_filter as $key => $filter) { + if ($field['tablename'] == $filter['tablename'] && $field['field'] == $filter['field']) { + $imported->exposed_filter[$key]['id'] = $id; + } + } } + dsm($imported->exposed_filter); // Exposed filters now get added to the filter array, not as a separate array. $count = 0; foreach ($imported->exposed_filter as $field) { - list(, $id) = explode('.', $field['field'], 2); + $id = $field['id']; $item = $view->get_item('default', 'filter', $id); if (views_get_handler($item['table'], $item['field'], 'filter')) { $item['exposed'] = TRUE;