From ebf9c60510ec9c338375127025f4288e8e7d6bd7 Mon Sep 17 00:00:00 2001
From: Daniel Wehner <daniel.wehner@erdfisch.de>
Date: Sat, 28 Jul 2012 23:12:54 -0500
Subject: [PATCH] fix some wizard issues... again
---
includes/admin.inc | 3 ++-
lib/Drupal/views/Plugins/Type/WizardPluginManager.php | 2 +-
2 files changed, 3 insertions(+), 2 deletions(-)
diff --git a/includes/admin.inc b/includes/admin.inc
index b3e68d6473ee..1550fd62f5d8 100644
--- a/includes/admin.inc
+++ b/includes/admin.inc
@@ -706,8 +706,9 @@ function views_ui_nojs_submit($form, &$form_state) {
function views_ui_wizard_form_validate($form, &$form_state) {
$wizard = views_ui_get_wizard($form_state['values']['show']['wizard_key']);
$manager = views_get_plugin_manager('wizard');
+ $definition = $manager->getDefinition($wizard['plugin_id']);
$form_state['wizard'] = $wizard;
- $form_state['wizard_instance'] = $manager->createInstance($wizard['plugin_id']);
+ $form_state['wizard_instance'] = $manager->createInstance($wizard['plugin_id'], $definition);
$errors = $form_state['wizard_instance']->validate($form, $form_state);
foreach ($errors as $name => $message) {
form_set_error($name, $message);
diff --git a/lib/Drupal/views/Plugins/Type/WizardPluginManager.php b/lib/Drupal/views/Plugins/Type/WizardPluginManager.php
index 092e96862ac7..5171c974d398 100644
--- a/lib/Drupal/views/Plugins/Type/WizardPluginManager.php
+++ b/lib/Drupal/views/Plugins/Type/WizardPluginManager.php
@@ -9,7 +9,7 @@
use Drupal\Component\Plugin\PluginManagerBase;
use Drupal\Component\Plugin\Factory\DefaultFactory;
-use Drupal\Views\Plugins\Discovery\ViewsDiscovery;
+use Drupal\views\Plugins\Discovery\ViewsDiscovery;
class WizardPluginManager extends PluginManagerBase {
public function __construct() {
--
GitLab