Project

General

Profile

Download (1.99 KB) Statistics
| Branch: | Tag: | Revision:
1
? mw.patch
2
? tmp.patch
3
Index: views_cache.inc
4
===================================================================
5
RCS file: /cvs/drupal-contrib/contributions/modules/views/Attic/views_cache.inc,v
6
retrieving revision 1.2.2.18
7
diff -u -F^f -r1.2.2.18 views_cache.inc
8
--- views_cache.inc	14 Jul 2007 19:12:02 -0000	1.2.2.18
9
+++ views_cache.inc	28 Sep 2007 20:57:11 -0000
10
@@ -276,14 +276,9 @@ function _views_get_query(&$view, $args,
11
   else {
12
     views_load_query();
13
     $info = _views_build_query($view, $args, $filters);
14
-    $data = array(
15
-        'query' => _views_replace_args($info['query'], $info['args']),
16
-        'countquery' => _views_replace_args($info['countquery'], $info['args']),
17
-    );
18
     if ($view->is_cacheable) {
19
-      cache_set('views_query:' . $view->name, 'cache_views', serialize($data));
20
+      cache_set('views_query:' . $view->name, 'cache_views', serialize($info));
21
     }
22
-    $info = array_merge($info, $data);
23
   }
24
 
25
   // Run-time replacement so we can do cacheing
26
@@ -332,4 +327,4 @@ function _views_get_style_plugins($title
27
     }
28
   }
29
   return ($titles ? $views_style_plugins['title'] : $views_style_plugins['base']);
30
-}
31
\ No newline at end of file
32
+}
33
Index: views_query.inc
34
===================================================================
35
RCS file: /cvs/drupal-contrib/contributions/modules/views/Attic/views_query.inc,v
36
retrieving revision 1.51.2.11
37
diff -u -F^f -r1.51.2.11 views_query.inc
38
--- views_query.inc	12 Apr 2007 15:18:59 -0000	1.51.2.11
39
+++ views_query.inc	28 Sep 2007 20:57:12 -0000
40
@@ -659,16 +659,3 @@ function _views_build_summary(&$query, $
41
     return $query;
42
   }
43
 }
44
-
45
-/*
46
- * Support db_query() style argument replacement in a clause.
47
- */
48
-
49
-function _views_replace_args($clause, $args) {
50
-  // cut & pasted directly from db_query.
51
-  if (isset($args[0]) and is_array($args[0])) { // 'All arguments in one array' syntax
52
-    $args = $args[0];
53
-  }
54
-  _db_query_callback($args, TRUE);
55
-  return preg_replace_callback(DB_QUERY_REGEXP, '_db_query_callback', $clause);
56
-}
(1-1/2)