Merge pull request #2 from dfeyer/Feature/AllowNULLForOverrideConfigu…

…ration [TASK] Allow NULL value for overrideConfiguration Releases: master
neos · Sep 8, 2015 · bde4fe7 · bde4fe7
2 parents f2c6575 + 923934f
commit bde4fe7
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/Classes/TYPO3/Form/ViewHelpers/RenderViewHelper.php b/Classes/TYPO3/Form/ViewHelpers/RenderViewHelper.php
@@ -52,9 +52,9 @@ class RenderViewHelper extends AbstractViewHelper {
 	 * @param array $overrideConfiguration factory specific configuration
 	 * @return string the rendered form
 	 */
-	public function render($persistenceIdentifier = NULL, $factoryClass = 'TYPO3\Form\Factory\ArrayFormFactory', $presetName = 'default', array $overrideConfiguration = array()) {
+	public function render($persistenceIdentifier = NULL, $factoryClass = 'TYPO3\Form\Factory\ArrayFormFactory', $presetName = 'default', array $overrideConfiguration = NULL) {
 		if (isset($persistenceIdentifier)) {
-			$overrideConfiguration = Arrays::arrayMergeRecursiveOverrule($this->formPersistenceManager->load($persistenceIdentifier), $overrideConfiguration);
+			$overrideConfiguration = Arrays::arrayMergeRecursiveOverrule($this->formPersistenceManager->load($persistenceIdentifier), $overrideConfiguration ?: array());
 		}
 
 		$factory = $this->objectManager->get($factoryClass);