From b1492b3b981d5f39c065deda276511b870223f93 Mon Sep 17 00:00:00 2001
From: "Dmitriy.trt" <dmitriy.trt@gmail.com>
Date: Fri, 15 Jun 2012 14:16:01 +0700
Subject: [PATCH 1/2] Fix warning on enabled cache and empty JS settings.

---
 plugins/views_plugin_cache.inc |    4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/plugins/views_plugin_cache.inc b/plugins/views_plugin_cache.inc
index 23ab5e1..969c843 100644
--- a/plugins/views_plugin_cache.inc
+++ b/plugins/views_plugin_cache.inc
@@ -212,7 +212,9 @@ class views_plugin_cache extends views_plugin {
     $this->storage['js'] = array_diff_assoc($js, $js_start);
 
     // Special case the settings key and get the difference of the data.
-    $this->storage['js']['settings'] = array_diff_assoc($js['settings']['data'], $js_start['settings']['data']);
+    $settings = isset($js['settings']['data']) ? $js['settings']['data'] : array();
+    $settings_start = isset($js_start['settings']['data']) ? $js_start['settings']['data'] : array();
+    $this->storage['js']['settings'] = array_diff_assoc($settings, $settings_start);
   }
 
   /**
-- 
1.7.10


From 6a636b2c78340f5c835cc7fde689c8283c508c5a Mon Sep 17 00:00:00 2001
From: "Dmitriy.trt" <dmitriy.trt@gmail.com>
Date: Fri, 15 Jun 2012 19:32:37 +0700
Subject: [PATCH 2/2] Issue #1636024: remove workarounds from the cache test

This workaround supressed warnings we fixed earlier
---
 tests/views_cache.test |    3 ---
 1 file changed, 3 deletions(-)

diff --git a/tests/views_cache.test b/tests/views_cache.test
index 5f3076e..df80453 100644
--- a/tests/views_cache.test
+++ b/tests/views_cache.test
@@ -163,9 +163,6 @@ class ViewsCacheTest extends ViewsSqlTest {
       'type' => 'time',
       'output_lifespan' => '3600',
     ));
-    // @todo The cache plugin expects settings['data'] to be set.
-    // Maybe the cache plugin should be changed.
-    drupal_add_js('setting', array('example' => ''));
 
     $view->preview();
     $view->destroy();
-- 
1.7.10