소스 검색

Fixing datepicker file conflict see #7149

Julio Montoya 10 년 전
부모
커밋
6b31625342
2개의 변경된 파일2개의 추가작업 그리고 3개의 파일을 삭제
  1. 0 0
      main/inc/lib/formvalidator/Element/datepicker_old.php
  2. 2 3
      main/inc/lib/formvalidator/FormValidator.class.php

+ 0 - 0
main/inc/lib/formvalidator/Element/datepicker.php → main/inc/lib/formvalidator/Element/datepicker_old.php


+ 2 - 3
main/inc/lib/formvalidator/FormValidator.class.php

@@ -124,13 +124,12 @@ class FormValidator extends HTML_QuickForm
 
         // Load some custom elements and rules
         $dir = api_get_path(LIBRARY_PATH) . 'formvalidator/';
-        $this->registerElementType('html_editor', $dir . 'Element/html_editor.php', 'HTML_QuickForm_html_editor');
 
+        $this->registerElementType('html_editor', $dir . 'Element/html_editor.php', 'HTML_QuickForm_html_editor');
         $this->registerElementType('date_range_picker', $dir . 'Element/DateRangePicker.php', 'DateRangePicker');
         $this->registerElementType('date_time_picker', $dir . 'Element/DateTimePicker.php', 'DateTimePicker');
         $this->registerElementType('date_picker', $dir . 'Element/DatePicker.php', 'DatePicker');
-
-        $this->registerElementType('datepicker', $dir . 'Element/datepicker.php', 'HTML_QuickForm_datepicker');
+        $this->registerElementType('datepicker', $dir . 'Element/datepicker_old.php', 'HTML_QuickForm_datepicker');
         $this->registerElementType('datepickerdate', $dir . 'Element/datepickerdate.php', 'HTML_QuickForm_datepickerdate');
         $this->registerElementType('receivers', $dir . 'Element/receivers.php', 'HTML_QuickForm_receivers');
         $this->registerElementType('select_language', $dir . 'Element/select_language.php', 'HTML_QuickForm_Select_Language');