summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorEarl Miles2010-03-12 00:17:33 (GMT)
committer Earl Miles2010-03-12 00:17:33 (GMT)
commit0a55ebbfa713bd860f37fba29639e5f1945a977b (patch)
treec59556803e6523f54950032316480596d2acb3f5
parent367615cda76f212e208a0b3911a3b2fc816283af (diff)
#640862 by dereine: Properly clear feed icon when cloning a view to prevent duplicate feed icons in attachments.
-rw-r--r--CHANGELOG.txt1
-rw-r--r--includes/view.inc2
2 files changed, 2 insertions, 1 deletions
diff --git a/CHANGELOG.txt b/CHANGELOG.txt
index ba124c2..a61bece 100644
--- a/CHANGELOG.txt
+++ b/CHANGELOG.txt
@@ -40,6 +40,7 @@ Views 2.x-dev
o #657384 by smoothify: Under rare circumstances, date default argument could get wrong value.
o #658842 by tomgf: Provide a proper ellipsis instead of "...".
o #662654 by dereine: Do not use query to load/validate a user if the user happens to be the logged in user.
+ o #640862 by dereine: Properly clear feed icon when cloning a view to prevent duplicate feed icons in attachments.
Other changes:
o #570558 by yhahn: Segment default views caching to conserve memory used by Views during normal operation.
diff --git a/includes/view.inc b/includes/view.inc
index 745d1b6..8f96a4f 100644
--- a/includes/view.inc
+++ b/includes/view.inc
@@ -1519,7 +1519,7 @@ class view extends views_db_object {
function clone_view() {
$clone = version_compare(phpversion(), '5.0') < 0 ? $this : clone($this);
- $keys = array('current_display', 'display_handler', 'build_info', 'built', 'executed', 'attachment_before', 'attachment_after', 'field', 'argument', 'filter', 'sort', 'relationship', 'query', 'inited', 'style_plugin', 'plugin_name', 'exposed_data', 'exposed_input', 'exposed_widgets', 'many_to_one_tables');
+ $keys = array('current_display', 'display_handler', 'build_info', 'built', 'executed', 'attachment_before', 'attachment_after', 'field', 'argument', 'filter', 'sort', 'relationship', 'query', 'inited', 'style_plugin', 'plugin_name', 'exposed_data', 'exposed_input', 'exposed_widgets', 'many_to_one_tables', 'feed_icon');
foreach ($keys as $key) {
if (isset($clone->$key)) {
unset($clone->$key);