From 02d3e4002e148bf2344a6c70ba3590927ff39d14 Mon Sep 17 00:00:00 2001 From: Kristiaan Van den Eynde Date: Mon, 20 Oct 2014 13:31:29 +0200 Subject: [PATCH] Issue #2359955 by kristiaanvandeneynde: Fixed Views causes nodes/users to show with wrong template file. --- modules/node/views_plugin_row_node_view.inc | 5 ++++- modules/user/views_plugin_row_user_view.inc | 3 +++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/modules/node/views_plugin_row_node_view.inc b/modules/node/views_plugin_row_node_view.inc index 4aefe46..c52feae 100644 --- a/modules/node/views_plugin_row_node_view.inc +++ b/modules/node/views_plugin_row_node_view.inc @@ -104,7 +104,10 @@ class views_plugin_row_node_view extends views_plugin_row { $node->view = $this->view; $build = node_view($node, $this->options['view_mode']); + // Do not leave the node object polluted with the view property. + unset($node->view); + return drupal_render($build); } } -} \ No newline at end of file +} diff --git a/modules/user/views_plugin_row_user_view.inc b/modules/user/views_plugin_row_user_view.inc index b48f459..0b19195 100644 --- a/modules/user/views_plugin_row_user_view.inc +++ b/modules/user/views_plugin_row_user_view.inc @@ -76,6 +76,9 @@ class views_plugin_row_user_view extends views_plugin_row { $account->view = $this->view; $build = user_view($account, $this->options['view_mode']); + // Do not leave the user object polluted with the view property. + unset($account->view); + return drupal_render($build); } } -- 1.7.9.4