Index: views.module
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/views.module,v
retrieving revision 1.166.2.45
diff -r1.166.2.45 views.module
182c182
<   $cache = cache_get("views_urls", 'cache_views');
---
>   $cache = views_cache_get("views_urls");
203c203
<     cache_set("views_urls", 'cache_views', serialize($views));
---
>     views_cache_set("views_urls", $views);
206c206
<     $views = unserialize($cache->data);
---
>     $views = $cache->data;
2146a2147,2202
> }
> 
> define('VIEWS_GZIP_TOKEN', 'GZIP_');
> 
> /**
>  * Abstracted cache_set() implements gzip compression if available
>  * see: http://drupal.org/node/121390
> */
> function views_cache_set($cid, $object) {
>   $data = serialize($object);
>   if (views_use_compression()) {
>     $data = VIEWS_GZIP_TOKEN.gzcompress($data);
>   }
>   cache_set($cid, 'cache_views', $data);
> }
> 
> /**
>  * Abstracted cache_get() implements gzip compression if available
>  * see: http://drupal.org/node/121390
> */
> function views_cache_get($cid) {
>   $data = cache_get($cid, 'cache_views');
>   if ($data) {
>     if (strpos($data->data, VIEWS_GZIP_TOKEN) !== FALSE) {  // see if the data is gzipd
>       if (views_use_compression()) {
>         $data->data = gzuncompress(substr($data->data, strlen(VIEWS_GZIP_TOKEN)));
>       }
>       else {
>         cache_clear_all($cid, 'cache_views');  // gzipd data we can't use, invalidate it
>         return 0;
>       }
>     }
>     $data->data = unserialize($data->data);
>     return $data;
>   }
>   return 0;
> }
> 
> /**
>  * checks for availability of gzip compression functions and sets/returns true/false accordingly
> */
> function views_use_compression() {
>   $var = variable_get('views_use_compression', -1);
>   if ($var != -1) {
>     return $var;
>   }
>   else {
>     if (function_exists('gzcompress') && function_exists('gzuncompress')) {
>       variable_set('views_use_compression', 1);
>       return 1;
>     }
>     else {
>       variable_set('views_use_compression', 0);
>       return 0;
>     }
>   }
Index: views_cache.inc
===================================================================
RCS file: /cvs/drupal-contrib/contributions/modules/views/Attic/views_cache.inc,v
retrieving revision 1.2.2.19
diff -r1.2.2.19 views_cache.inc
30,31c30,31
<     $data = cache_get("views_arguments:$locale", 'cache_views');
<     $cache = unserialize($data->data);
---
>     $data = views_cache_get("views_arguments:$locale");
>     $cache = $data->data;
57c57
<       cache_set("views_arguments:$locale", 'cache_views', serialize($cache));
---
>       views_cache_set("views_arguments:$locale", $cache);
72,73c72,73
<     $data = cache_get("views_tables:$locale", 'cache_views');
<     $cache = unserialize($data->data);
---
>     $data = views_cache_get("views_tables:$locale");
>     $cache = $data->data;
146c146
<       cache_set("views_tables:$locale", 'cache_views', serialize($views_tables));
---
>       views_cache_set("views_tables:$locale", $views_tables);
226,227c226,227
<     $data = cache_get("views_default_views:$locale", 'cache_views');
<     $cache = unserialize($data->data);
---
>     $data = views_cache_get("views_default_views:$locale");
>     $cache = $data->data;
246c246
<       cache_set("views_default_views:$locale", 'cache_views', serialize($views_default_views));
---
>       views_cache_set("views_default_views:$locale", $views_default_views);
268c268
<   if ($view->is_cacheable && ($cached = cache_get('views_query:' . $view->name, 'cache_views'))) {
---
>   if ($view->is_cacheable && ($cached = views_cache_get('views_query:' . $view->name))) {
279a280,282
> <<<<<<< views_cache.inc
>       views_cache_set('views_query:' . $view->name, $data);
> =======
280a284
> >>>>>>> 1.2.2.19
310c314
<     $data = cache_get("views_style_plugins:$locale", 'cache_views');
---
>     $data = views_cache_get("views_style_plugins:$locale");
326c330
<       cache_set("views_style_plugins:$locale", 'cache_views', serialize($cache));
---
>       views_cache_set("views_style_plugins:$locale", $cache);