From da4d994453c60064b960dc1311bea83153fd8a30 Mon Sep 17 00:00:00 2001
From: Daniel Wehner <daniel.wehner@erdfisch.de>
Date: Thu, 26 Jul 2012 14:08:36 -0500
Subject: [PATCH] by damiankloip: Make some work to get display going on
---
includes/plugins.inc | 2 +-
.../Plugins/views/display/{Default.php => DefaultDisplay.php} | 4 ++--
lib/Drupal/views/View.php | 4 +++-
3 files changed, 6 insertions(+), 4 deletions(-)
rename lib/Drupal/views/Plugins/views/display/{Default.php => DefaultDisplay.php} (93%)
diff --git a/includes/plugins.inc b/includes/plugins.inc
index 9618f8ae6730..1bda0686860d 100644
--- a/includes/plugins.inc
+++ b/includes/plugins.inc
@@ -19,7 +19,7 @@ function views_views_plugins() {
'default' => array(
'title' => t('Master'),
'help' => t('Default settings for this view.'),
- 'class' => 'Drupal\views\Plugins\views\display\Default',
+ 'class' => 'Drupal\views\Plugins\views\display\DefaultDisplay',
'theme' => 'views_view',
'no ui' => TRUE,
'no remove' => TRUE,
diff --git a/lib/Drupal/views/Plugins/views/display/Default.php b/lib/Drupal/views/Plugins/views/display/DefaultDisplay.php
similarity index 93%
rename from lib/Drupal/views/Plugins/views/display/Default.php
rename to lib/Drupal/views/Plugins/views/display/DefaultDisplay.php
index f90193dcfec7..6843242cb1b7 100644
--- a/lib/Drupal/views/Plugins/views/display/Default.php
+++ b/lib/Drupal/views/Plugins/views/display/DefaultDisplay.php
@@ -2,7 +2,7 @@
/**
* @file
- * Definition of Drupal\views\Plugins\views\display\Default.
+ * Definition of Drupal\views\Plugins\views\display\DefaultDisplay.
*/
namespace Drupal\views\Plugins\views\display;
@@ -12,7 +12,7 @@
*
* @ingroup views_display_plugins
*/
-class Default extends DisplayPluginBase {
+class DefaultDisplay extends DisplayPluginBase {
/**
* Determine if this display is the 'default' display which contains
* fallback settings
diff --git a/lib/Drupal/views/View.php b/lib/Drupal/views/View.php
index fcab2ae3d34d..f62d95ec0b4c 100644
--- a/lib/Drupal/views/View.php
+++ b/lib/Drupal/views/View.php
@@ -9,6 +9,7 @@
use Symfony\Component\HttpFoundation\Response;
use Drupal\views\Plugins\Type\QueryPluginManager;
+use Drupal\views\Plugins\Type\DisplayPluginManager;
/**
* @defgroup views_objects Objects that represent a View or part of a view
@@ -471,7 +472,8 @@ function init_display($reset = FALSE) {
$this->display[$id] = clone $this->display[$id];
unset($this->display[$id]->handler);
}
- $this->display[$id]->handler = views_get_plugin('display', $this->display[$id]->display_plugin);
+ $plugin_manager = new DisplayPluginManager();
+ $this->display[$id]->handler = $plugin_manager->createInstance($this->display[$id]->display_plugin);
if (!empty($this->display[$id]->handler)) {
$this->display[$id]->handler->localization_keys = array($id);
// Initialize the new display handler with data.
--
GitLab