diff options
Diffstat (limited to 'modules/node')
| -rw-r--r-- | modules/node/node.admin.inc | 13 |
1 files changed, 4 insertions, 9 deletions
diff --git a/modules/node/node.admin.inc b/modules/node/node.admin.inc index 74d41146b..67790b1f4 100644 --- a/modules/node/node.admin.inc +++ b/modules/node/node.admin.inc @@ -171,7 +171,8 @@ function node_build_filter_query() { // Build query $where = $args = array(); $join = ''; - foreach ($_SESSION['node_overview_filter'] as $index => $filter) { + $filter_data = isset($_SESSION['node_overview_filter']) ? $_SESSION['node_overview_filter'] : array(); + foreach ($filter_data as $index => $filter) { list($key, $value) = $filter; switch ($key) { case 'status': @@ -202,10 +203,7 @@ function node_build_filter_query() { * Return form for node administration filters. */ function node_filter_form() { - if (!isset($_SESSION['node_overview_filter'])) { - drupal_set_session('node_overview_filter', array()); - } - $session = &$_SESSION['node_overview_filter']; + $session = isset($_SESSION['node_overview_filter']) ? $_SESSION['node_overview_filter'] : array(); $filters = node_filters(); $i = 0; @@ -320,9 +318,6 @@ function node_filter_form_submit($form, &$form_state) { $flat_options = form_options_flatten($filters[$filter]['options']); if (isset($flat_options[$form_state['values'][$filter]])) { - if (!isset($_SESSION['node_overview_filter'])) { - drupal_set_session('node_overview_filter', array()); - } $_SESSION['node_overview_filter'][] = array($filter, $form_state['values'][$filter]); } } @@ -331,7 +326,7 @@ function node_filter_form_submit($form, &$form_state) { array_pop($_SESSION['node_overview_filter']); break; case t('Reset'): - drupal_set_session('node_overview_filter', array()); + $_SESSION['node_overview_filter'] = array(); break; } } |