Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
D
drupal
Manage
Activity
Members
Labels
Plan
Wiki
Custom issue tracker
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Locked files
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Model registry
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Code review analytics
Insights
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
Community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
project
drupal
Commits
2ab27d44
Commit
2ab27d44
authored
12 years ago
by
dmitriy.trt
Committed by
Tim Plunkett
12 years ago
Browse files
Options
Downloads
Patches
Plain Diff
Issue
#1636024
by Dmitriy.trt: Fixed Warning on enabled cache and no JS added.
parent
69eaeefe
No related branches found
No related tags found
2 merge requests
!7452
Issue #1797438. HTML5 validation is preventing form submit and not fully...
,
!789
Issue #3210310: Adjust Database API to remove deprecated Drupal 9 code in Drupal 10
Changes
2
Hide whitespace changes
Inline
Side-by-side
Showing
2 changed files
plugins/views_plugin_cache.inc
+3
-1
3 additions, 1 deletion
plugins/views_plugin_cache.inc
tests/views_cache.test
+0
-3
0 additions, 3 deletions
tests/views_cache.test
with
3 additions
and
4 deletions
plugins/views_plugin_cache.inc
+
3
−
1
View file @
2ab27d44
...
...
@@ -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
);
}
/**
...
...
This diff is collapsed.
Click to expand it.
tests/views_cache.test
+
0
−
3
View file @
2ab27d44
...
...
@@ -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
();
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment