Skip to content

Commit 6b31625

Browse files
committed
Fixing datepicker file conflict see #7149
1 parent 99d2830 commit 6b31625

File tree

2 files changed

+2
-3
lines changed

2 files changed

+2
-3
lines changed

main/inc/lib/formvalidator/FormValidator.class.php

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -124,13 +124,12 @@ function __construct($form_name, $method = 'post', $action = '', $target = '', $
124124

125125
// Load some custom elements and rules
126126
$dir = api_get_path(LIBRARY_PATH) . 'formvalidator/';
127-
$this->registerElementType('html_editor', $dir . 'Element/html_editor.php', 'HTML_QuickForm_html_editor');
128127

128+
$this->registerElementType('html_editor', $dir . 'Element/html_editor.php', 'HTML_QuickForm_html_editor');
129129
$this->registerElementType('date_range_picker', $dir . 'Element/DateRangePicker.php', 'DateRangePicker');
130130
$this->registerElementType('date_time_picker', $dir . 'Element/DateTimePicker.php', 'DateTimePicker');
131131
$this->registerElementType('date_picker', $dir . 'Element/DatePicker.php', 'DatePicker');
132-
133-
$this->registerElementType('datepicker', $dir . 'Element/datepicker.php', 'HTML_QuickForm_datepicker');
132+
$this->registerElementType('datepicker', $dir . 'Element/datepicker_old.php', 'HTML_QuickForm_datepicker');
134133
$this->registerElementType('datepickerdate', $dir . 'Element/datepickerdate.php', 'HTML_QuickForm_datepickerdate');
135134
$this->registerElementType('receivers', $dir . 'Element/receivers.php', 'HTML_QuickForm_receivers');
136135
$this->registerElementType('select_language', $dir . 'Element/select_language.php', 'HTML_QuickForm_Select_Language');

0 commit comments

Comments
 (0)