Fix for config loader in FormHelper

cakephp · Nov 14, 2014 · b0b851f · b0b851f
1 parent 1b786b0
commit b0b851f
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 6 deletions.
diff --git a/src/View/Helper/FormHelper.php b/src/View/Helper/FormHelper.php
@@ -202,7 +202,8 @@ public function __construct(View $View, array $config = []) {
 			unset($config['registry']);
 		}
 		if (isset($config['widgets'])) {
-			$widgets = $config['widgets'] + $widgets;
+			if (is_string($config['widgets'])) $config['widgets'] = [$config['widgets']];
+			$widgets = $widgets + $config['widgets'];
 			unset($config['widgets']);
 		}
 

diff --git a/src/View/Widget/WidgetRegistry.php b/src/View/Widget/WidgetRegistry.php
@@ -62,11 +62,7 @@ class WidgetRegistry {
 	public function __construct(StringTemplate $templates, View $view, $widgets = []) {
 		$this->_templates = $templates;
 		if (!empty($widgets)) {
-			if (is_string($widgets)) {
-				$this->load($widgets);
-			} else {
-				$this->add($widgets);
-			}
+			$this->add($widgets);
 		}
 		$this->_widgets['_view'] = $view;
 	}
@@ -115,6 +111,8 @@ public function add(array $widgets) {
 				throw new \RuntimeException(
 					'Widget objects must implement Cake\View\Widget\WidgetInterface.'
 				);
+			} elseif (is_string($object)){
+				$this->load($object);
 			}
 		}
 		$this->_widgets = $widgets + $this->_widgets;