Merge branch 'release/2.1.0'

hofff · Jan 29, 2016 · f8569c9 · f8569c9
2 parents 064cb26 + 78459d4
commit f8569c9
Showing 1 changed file with 6 additions and 2 deletions.
diff --git a/CT_ROOT/system/modules/hofff_calendarfield/forms/FormCalendarField.php b/CT_ROOT/system/modules/hofff_calendarfield/forms/FormCalendarField.php
@@ -36,7 +36,7 @@ class FormCalendarField extends \FormTextField
 	 * Always set rgxp to `date`
 	 *
 	 * @param array $arrAttributes An optional attributes array
-	 */ 
+	 */
 	public function __construct($arrAttributes = null)
 	{
 		parent::__construct($arrAttributes);
@@ -127,6 +127,10 @@ public function parse($arrAttributes=null)
 			// correctly style the date format
 			$arrConfig['format'] = "'" . $this->dateformat_PHP_to_jQueryUI($dateFormat) . "'";
 
+			if (is_array($this->dateConfig)) {
+				$arrConfig = array_replace($arrConfig, $this->dateConfig);
+			}
+
 			// HOOK: allow to customize the date picker
 			if (isset($GLOBALS['TL_HOOKS']['formCalendarField']) && is_array($GLOBALS['TL_HOOKS']['formCalendarField'])) {
 				foreach ($GLOBALS['TL_HOOKS']['formCalendarField'] as $callback) {
@@ -153,7 +157,7 @@ public function parse($arrAttributes=null)
 
 		return parent::parse($arrAttributes);
 	}
-		
+
 	/**
 	 * Generate the widget and return it as string
 	 *