Commit 2ab27d44 authored by Dmitriy.trt's avatar Dmitriy.trt Committed by tim.plunkett

Issue #1636024 by Dmitriy.trt: Fixed Warning on enabled cache and no JS added.

parent 69eaeefe
......@@ -230,7 +230,9 @@ function gather_headers() {
$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);
}
/**
......
......@@ -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();
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment