From 17454ca200c59df933f0e86fadeb1b3f70ae5edb Mon Sep 17 00:00:00 2001
From: Manuel Cillero <manuel@cillero.es>
Date: Tue, 8 May 2018 13:03:30 +0200
Subject: [PATCH] Applied D6LTS contrib patch SA-CONTRIB-2014-054

---
 modules/views/includes/view.inc                | 2 +-
 modules/views/plugins/views_plugin_display.inc | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/views/includes/view.inc b/modules/views/includes/view.inc
index 57a4fde..0444b81 100644
--- a/modules/views/includes/view.inc
+++ b/modules/views/includes/view.inc
@@ -416,7 +416,7 @@ class view extends views_db_object {
    */
   function _init_handler($key, $info) {
     // Load the requested items from the display onto the object.
-    $this->$key = $this->display_handler->get_handlers($key);
+    $this->$key = &$this->display_handler->get_handlers($key);
 
     // This reference deals with difficult PHP indirection.
     $handlers = &$this->$key;
diff --git a/modules/views/plugins/views_plugin_display.inc b/modules/views/plugins/views_plugin_display.inc
index 3c47037..38b585f 100644
--- a/modules/views/plugins/views_plugin_display.inc
+++ b/modules/views/plugins/views_plugin_display.inc
@@ -565,7 +565,7 @@ class views_plugin_display extends views_plugin {
   /**
    * Get a full array of handlers for $type. This caches them.
    */
-  function get_handlers($type) {
+  function &get_handlers($type) {
     if (!isset($this->handlers[$type])) {
       $this->handlers[$type] = array();
       $types = views_object_types();