*** download/views/views_cache.inc	Sat May  5 03:40:18 2007
--- live/views/views_cache.inc	Sun Jun 24 16:25:48 2007
***************
*** 274,286 ****
    else {
      views_load_query();
      $info = _views_build_query($view, $args, $filters);
!     if ($view->is_cacheable) {
!       $data = array(
          'query' => _views_replace_args($info['query'], $info['args']),
          'countquery' => _views_replace_args($info['countquery'], $info['args']),
!       );
        cache_set('views_query:' . $view->name, 'cache_views', serialize($data));
      }
    }
  
    // Run-time replacement so we can do cacheing
--- 274,287 ----
    else {
      views_load_query();
      $info = _views_build_query($view, $args, $filters);
!     $data = array(
          'query' => _views_replace_args($info['query'], $info['args']),
          'countquery' => _views_replace_args($info['countquery'], $info['args']),
!     );
!     if ($view->is_cacheable) {
        cache_set('views_query:' . $view->name, 'cache_views', serialize($data));
      }
+     $info = array_merge($info, $data);
    }
  
    // Run-time replacement so we can do cacheing