summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--modules/node.module2
-rw-r--r--modules/node/node.module2
2 files changed, 2 insertions, 2 deletions
diff --git a/modules/node.module b/modules/node.module
index 48a15dcba..dc82cef05 100644
--- a/modules/node.module
+++ b/modules/node.module
@@ -826,7 +826,7 @@ function node_admin_nodes() {
'options' => $terms, 'join' => 'INNER JOIN {term_node} tn ON n.nid = tn.nid'));
// Initialize/reset filters
- if (!isset($_SESSION['node_overview_filter']) || $op == t('Reset')) {
+ if (!isset($_SESSION['node_overview_filter']) || !is_array($_SESSION['node_overview_filter']) || $op == t('Reset')) {
$_SESSION['node_overview_filter'] = array();
}
$session = &$_SESSION['node_overview_filter'];
diff --git a/modules/node/node.module b/modules/node/node.module
index 48a15dcba..dc82cef05 100644
--- a/modules/node/node.module
+++ b/modules/node/node.module
@@ -826,7 +826,7 @@ function node_admin_nodes() {
'options' => $terms, 'join' => 'INNER JOIN {term_node} tn ON n.nid = tn.nid'));
// Initialize/reset filters
- if (!isset($_SESSION['node_overview_filter']) || $op == t('Reset')) {
+ if (!isset($_SESSION['node_overview_filter']) || !is_array($_SESSION['node_overview_filter']) || $op == t('Reset')) {
$_SESSION['node_overview_filter'] = array();
}
$session = &$_SESSION['node_overview_filter'];