From 120e0e2ed5874256bb869a1a8bcb3bf28459ee2d Mon Sep 17 00:00:00 2001
Message-Id: <120e0e2ed5874256bb869a1a8bcb3bf28459ee2d.1343554261.git.dmitriy.trt@gmail.com>
From: "Dmitriy.trt" <dmitriy.trt@gmail.com>
Date: Sun, 29 Jul 2012 16:18:50 +0700
Subject: [PATCH] Issue #1055616: Add result and theme to the output cache key

---
 plugins/views_plugin_cache.inc |    2 +-
 tests/views_cache.test         |    2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/plugins/views_plugin_cache.inc b/plugins/views_plugin_cache.inc
index 2e420c3..32cf673 100644
--- a/plugins/views_plugin_cache.inc
+++ b/plugins/views_plugin_cache.inc
@@ -302,7 +302,7 @@ class views_plugin_cache extends views_plugin {
         'result' => $this->view->result,
         'theme' => $GLOBALS['theme'],
       );
-      $this->_output_key = $this->view->name . ':' . $this->display->id . ':output:' . $this->get_cache_key();
+      $this->_output_key = $this->view->name . ':' . $this->display->id . ':output:' . $this->get_cache_key($key_data);
     }
 
     return $this->_output_key;
diff --git a/tests/views_cache.test b/tests/views_cache.test
index f79c8b8..6e27f5e 100644
--- a/tests/views_cache.test
+++ b/tests/views_cache.test
@@ -279,7 +279,7 @@ class ViewsCacheTest extends ViewsSqlTest {
     $view->set_exposed_input(array(
       'name' => 'Rin',
     ));
-   $this->executeView($view);
+    $this->executeView($view);
     $first_result = $view->result;
     $first_output = $view->render();
     $this->assertEqual(1, count($first_result), t('The number of rows returned by the first view match.'));
-- 
1.7.10.4