From 953de7e4e258250d8d7fc4f3a3bd39ebe605b06a Mon Sep 17 00:00:00 2001
From: Daniel Wehner <daniel.wehner@erdfisch.de>
Date: Fri, 27 Jul 2012 09:37:32 -0500
Subject: [PATCH] remove a bunch of notices
---
includes/plugins.inc | 6 +++---
...{ExposedFormPluginBase.inc => ExposedFormPluginBase.php} | 0
lib/Drupal/views/View.php | 3 +--
modules/node.views.inc | 4 ++--
modules/node/views_plugin_row_node_rss.inc | 4 +++-
modules/node/views_plugin_row_node_view.inc | 4 +++-
6 files changed, 12 insertions(+), 9 deletions(-)
rename lib/Drupal/views/Plugins/views/exposed_form/{ExposedFormPluginBase.inc => ExposedFormPluginBase.php} (100%)
diff --git a/includes/plugins.inc b/includes/plugins.inc
index 44f6016407a0..a6a2720ca00c 100644
--- a/includes/plugins.inc
+++ b/includes/plugins.inc
@@ -445,9 +445,9 @@ function views_discover_plugins() {
if (!isset($def['path'])) {
$def['path'] = $path;
}
- if (!isset($def['file'])) {
- $def['file'] = $def['handler'] . '.inc';
- }
+// if (!isset($def['file'])) {
+// $def['file'] = $def['handler'] . '.inc';
+// }
if (!isset($def['parent'])) {
$def['parent'] = 'parent';
}
diff --git a/lib/Drupal/views/Plugins/views/exposed_form/ExposedFormPluginBase.inc b/lib/Drupal/views/Plugins/views/exposed_form/ExposedFormPluginBase.php
similarity index 100%
rename from lib/Drupal/views/Plugins/views/exposed_form/ExposedFormPluginBase.inc
rename to lib/Drupal/views/Plugins/views/exposed_form/ExposedFormPluginBase.php
diff --git a/lib/Drupal/views/View.php b/lib/Drupal/views/View.php
index bed14f7014c1..6de7a8dcb90e 100644
--- a/lib/Drupal/views/View.php
+++ b/lib/Drupal/views/View.php
@@ -579,8 +579,7 @@ function init_style() {
$this->style_options = $this->display_handler->get_option('style_options');
}
- $style_manager = new StylePluginManager();
- $this->style_plugin = $style_manager->createInstance($this->plugin_name);
+ $this->style_plugin = views_get_plugin('style', $this->plugin_name);
if (empty($this->style_plugin)) {
return FALSE;
diff --git a/modules/node.views.inc b/modules/node.views.inc
index 11faa15baa71..4bdbac453bc6 100644
--- a/modules/node.views.inc
+++ b/modules/node.views.inc
@@ -634,7 +634,7 @@ function node_views_plugins() {
'node' => array(
'title' => t('Content'),
'help' => t('Display the content with standard node view.'),
- 'handler' => 'views_plugin_row_node_view',
+ 'class' => 'views_plugin_row_node_view',
'path' => drupal_get_path('module', 'views') . '/modules/node', // not necessary for most modules
'base' => array('node'), // only works with 'node' as base.
'uses options' => TRUE,
@@ -644,7 +644,7 @@ function node_views_plugins() {
'node_rss' => array(
'title' => t('Content'),
'help' => t('Display the content with standard node view.'),
- 'handler' => 'views_plugin_row_node_rss',
+ 'class' => 'views_plugin_row_node_rss',
'path' => drupal_get_path('module', 'views') . '/modules/node', // not necessary for most modules
'theme' => 'views_view_row_rss',
'base' => array('node'), // only works with 'node' as base.
diff --git a/modules/node/views_plugin_row_node_rss.inc b/modules/node/views_plugin_row_node_rss.inc
index b0161c5c8341..662dc6407b83 100644
--- a/modules/node/views_plugin_row_node_rss.inc
+++ b/modules/node/views_plugin_row_node_rss.inc
@@ -5,11 +5,13 @@
* Contains the node RSS row style plugin.
*/
+use Drupal\views\Plugins\views\row\RowPluginBase;
+
/**
* Plugin which performs a node_view on the resulting object
* and formats it as an RSS item.
*/
-class views_plugin_row_node_rss extends views_plugin_row {
+class views_plugin_row_node_rss extends RowPluginBase {
// Basic properties that let the row style follow relationships.
var $base_table = 'node';
var $base_field = 'nid';
diff --git a/modules/node/views_plugin_row_node_view.inc b/modules/node/views_plugin_row_node_view.inc
index 6060aa9d62c6..1ae2008a5b2b 100644
--- a/modules/node/views_plugin_row_node_view.inc
+++ b/modules/node/views_plugin_row_node_view.inc
@@ -5,6 +5,8 @@
* Contains the node view row style plugin.
*/
+use Drupal\views\Plugins\views\row\RowPluginBase;
+
/**
* Plugin which performs a node_view on the resulting object.
*
@@ -12,7 +14,7 @@
*
* @ingroup views_row_plugins
*/
-class views_plugin_row_node_view extends views_plugin_row {
+class views_plugin_row_node_view extends RowPluginBase {
// Basic properties that let the row style follow relationships.
var $base_table = 'node';
var $base_field = 'nid';
--
GitLab