diff -u b/includes/php4.inc b/includes/php4.inc --- b/includes/php4.inc +++ b/includes/php4.inc @@ -28,7 +28,7 @@ if (!empty($results) && is_array($results)) { foreach($results as $name => $view) { // Only views with a sufficiently high api version are eligible. - if (!empty($view->api_version) && $view->api_version >= 2) { + if (!empty($view->api_version) && $view->api_version >= views_api_minimum_version()) { // Do not cache dead handlers. $view->destroy(); if (!isset($cache[$name])) { diff -u b/includes/php5.inc b/includes/php5.inc --- b/includes/php5.inc +++ b/includes/php5.inc @@ -76,7 +76,7 @@ // requested on the page. if (isset($this->index[$offset])) { $views = views_initialize_module_views($this->index[$offset]); - if (is_object($views[$offset])) { + if (isset($views[$offset]) && is_object($views[$offset])) { $this->storage[$offset] = $views[$offset]; $view_clone = clone $views[$offset]; $view_clone->destroy(); @@ -203,7 +203,7 @@ } function offsetExists($offset) { - return isset($this->views[$offset]); + return (bool) views_get_view($offset); } function offsetUnset($offset) { @@ -211,7 +211,7 @@ } function offsetGet($offset) { - return isset($this->views[$offset]) ? $this->views[$offset] : null; + return views_get_view($offset); } } @@ -232,7 +232,7 @@ if ($result) { drupal_alter('views_default_views', $result); foreach ($result as $key => $view) { - if (!empty($view->api_version) && $view->api_version >= 2) { + if (!empty($view->api_version) && $view->api_version >= views_api_minimum_version()) { $views[$key] = $view; } }