? 0-views-file_managed_extras.patch
? 667950-javascript-states_0.patch
? 694094-drupal_static.patch
? 884730.patch
? 894618-filter_date-between.patch
? 930582-fix.patch
? 931552-fix.patch
? 931886.patch
? 931886_0.patch
? d7_views_taxonomy_handlers.patch
? views.aggregator_feed_item_id.patch
? viewspatch
? modules/taxonomy/views_handler_filter_vocabulary_machine_name.inc
Index: views.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/views.module,v
retrieving revision 1.341.4.37
diff -u -p -r1.341.4.37 views.module
--- views.module	16 Oct 2010 05:41:39 -0000	1.341.4.37
+++ views.module	16 Oct 2010 10:51:57 -0000
@@ -589,8 +589,8 @@ function views_include($file) {
 /**
  * Load views files on behalf of modules.
  */
-function views_module_include($file, $reset = FALSE) {
-  foreach (views_get_module_apis($reset) as $module => $info) {
+function views_module_include($file) {
+  foreach (views_get_module_apis() as $module => $info) {
     if (file_exists(DRUPAL_ROOT . "/$info[path]/$module.$file")) {
       require_once DRUPAL_ROOT . "/$info[path]/$module.$file";
     }
@@ -600,9 +600,9 @@ function views_module_include($file, $re
 /**
  * Get a list of modules that support the current views API.
  */
-function views_get_module_apis($reset = FALSE) {
-  static $cache = NULL;
-  if (!isset($cache) || $reset) {
+function views_get_module_apis() {
+  $cache = &drupal_static(__FUNCTION__, NULL);
+  if (!isset($cache)) {
     $cache = array();
     foreach (module_implements('views_api') as $module) {
       $info = module_invoke($module, 'views_api');
@@ -743,9 +743,9 @@ function views_get_handler($table, $fiel
 /**
  * Fetch Views' data from the cache
  */
-function views_fetch_data($table = NULL, $reset = FALSE) {
+function views_fetch_data($table = NULL) {
   views_include('cache');
-  return _views_fetch_data($table, $reset);
+  return _views_fetch_data($table);
 }
 
 // -----------------------------------------------------------------------
@@ -754,17 +754,17 @@ function views_fetch_data($table = NULL,
 /**
  * Fetch the plugin data from cache.
  */
-function views_fetch_plugin_data($type = NULL, $plugin = NULL, $reset = FALSE) {
+function views_fetch_plugin_data($type = NULL, $plugin = NULL) {
   views_include('cache');
-  return _views_fetch_plugin_data($type, $plugin, $reset);
+  return _views_fetch_plugin_data($type, $plugin);
 }
 
 /**
  * Get a handler for a plugin
  */
-function views_get_plugin($type, $plugin, $reset = FALSE) {
+function views_get_plugin($type, $plugin) {
   views_include('handlers');
-  $definition = views_fetch_plugin_data($type, $plugin, $reset);
+  $definition = views_fetch_plugin_data($type, $plugin);
   if (!empty($definition)) {
     return _views_create_handler($definition, $type);
   }
@@ -825,10 +825,10 @@ function views_new_view() {
  *
  * @return An associative array of all known default views.
  */
-function views_discover_default_views($reset = FALSE) {
-  static $cache = array();
+function views_discover_default_views() {
+  $cache = &drupal_static(__FUNCTION__, NULL);
 
-  if (empty($cache) || $reset) {
+  if (empty($cache)) {
     views_include('cache');
     $cache = _views_discover_default_views($reset);
   }
Index: includes/cache.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/includes/cache.inc,v
retrieving revision 1.25.4.7
diff -u -p -r1.25.4.7 cache.inc
--- includes/cache.inc	16 Oct 2010 05:41:40 -0000	1.25.4.7
+++ includes/cache.inc	16 Oct 2010 10:51:57 -0000
@@ -24,9 +24,9 @@ function _views_include_default_views() 
 /**
  * Fetch Views' data from the cache
  */
-function _views_fetch_data($table = NULL, $reset = FALSE) {
-  static $cache = NULL;
-  if (!isset($cache) || $reset) {
+function _views_fetch_data($table = NULL) {
+  $cache = &drupal_static(__FUNCTION__, NULL);
+  if (!isset($cache)) {
     $start = microtime(TRUE);
     // NOTE: This happens whether we retrieve them from cache or otherwise.
 
@@ -61,9 +61,9 @@ function _views_fetch_data($table = NULL
 /**
  * Fetch the plugin data from cache.
  */
-function _views_fetch_plugin_data($type = NULL, $plugin = NULL, $reset = FALSE) {
-  static $cache = NULL;
-  if (!isset($cache) || $reset) {
+function _views_fetch_plugin_data($type = NULL, $plugin = NULL) {
+  $cache = &drupal_static(__FUNCTION__, NULL);
+  if (!isset($cache)) {
     $start = microtime(TRUE);
     views_include('plugins');
     views_include_handlers();
@@ -94,10 +94,9 @@ function _views_fetch_plugin_data($type 
  *
  * @return An associative array of all known default views.
  */
-function _views_discover_default_views($reset = FALSE) {
-  static $cache = NULL;
-
-  if (!isset($cache) || $reset) {
+function _views_discover_default_views() {
+  $cache = &drupal_static(__FUNCTION__, NULL);
+  if (!isset($cache)) {
     $index = views_cache_get('views_default_views_index', TRUE);
 
     // Retrieve each cached default view