Fixes probleme with parameter dateFormat (see #36 )

hofff · Mar 27, 2017 · 9984870 · 9984870
1 parent 2527729
commit 9984870
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/CT_ROOT/system/modules/hofff_calendarfield/forms/FormCalendarField.php b/CT_ROOT/system/modules/hofff_calendarfield/forms/FormCalendarField.php
@@ -74,8 +74,8 @@ public function parse($arrAttributes=null)
     $GLOBALS['TL_JAVASCRIPT'][] = TL_ASSETS_URL . 'assets/jquery/ui/'.JQUERY_UI.'/jquery-ui.min.js';
     $GLOBALS['TL_JAVASCRIPT'][] = TL_ASSETS_URL . 'assets/hofff/calendarfield/jquery.ui.datepicker/'.JQUERY_UI.'/jquery.ui.datepicker.min.js';
     $GLOBALS['TL_JAVASCRIPT'][] = TL_ASSETS_URL . 'assets/hofff/calendarfield/jquery.ui.datepicker/'.JQUERY_UI.'/i18n/jquery.ui.datepicker-' . $objPage->language . '.js';
-
-    $dateFormat = $this->dateFormat ?: $GLOBALS['TL_CONFIG'][$this->rgxp . 'Format'];
+    
+    $dateFormat = $this->dateFormat ? $this->dateFormat : $objPage->dateFormat;
 
     if ($this->dateParseValue && $this->varValue != '') {
       $this->varValue = \Date::parse($dateFormat, strtotime($this->varValue));
@@ -129,7 +129,7 @@ public function parse($arrAttributes=null)
     }
 
     // correctly style the date format
-    $arrConfig['format'] = $this->dateformat_PHP_to_jQueryUI($dateFormat);
+    $arrConfig['dateFormat'] = $this->dateformat_PHP_to_jQueryUI($dateFormat);
 
     if (is_array($this->dateConfig)) {
       $arrConfig = array_replace($arrConfig, $this->dateConfig);