diff --git a/main/inc/lib/sessionmanager.lib.php b/main/inc/lib/sessionmanager.lib.php index 5ee5ce808d..6171e8e9d3 100755 --- a/main/inc/lib/sessionmanager.lib.php +++ b/main/inc/lib/sessionmanager.lib.php @@ -5431,7 +5431,7 @@ class SessionManager /** * Returns list of a few data from session (name, short description, start date, end date) * And the next extra fields - * short_description, mode, duration, vacancies, brochure, target, schedule + * short_description, mode, human_text_duration, vacancies, brochure, target, schedule * from Session category Id. * @param int $categoryId * @param string $target @@ -5450,7 +5450,7 @@ class SessionManager // Join session field and session field values tables $joinTable = $sfTable . ' sf INNER JOIN ' . $sfvTable . ' sfv ON sf.id = sfv.field_id'; $fieldsArray = array( - 'short_description', 'mode', 'duration', 'vacancies', 'brochure', 'target', 'schedule' + 'short_description', 'mode', 'human_text_duration', 'vacancies', 'brochure', 'target', 'schedule' ); // Get the session list from session category and target $sessionList = Database::select( diff --git a/plugin/advancedsubscription/src/HookAdvancedSubscription.php b/plugin/advancedsubscription/src/HookAdvancedSubscription.php index a8da5861a3..790765d111 100644 --- a/plugin/advancedsubscription/src/HookAdvancedSubscription.php +++ b/plugin/advancedsubscription/src/HookAdvancedSubscription.php @@ -77,7 +77,7 @@ class HookAdvancedSubscription extends HookObserver implements 'mode' => array('name' => 'mode', 'type' => 'xsd:string'), // session.mode 'date_start' => array('name' => 'date_start', 'type' => 'xsd:string'), // session.date_start 'date_end' => array('name' => 'date_end', 'type' => 'xsd:string'), // session.date_end - 'duration' => array('name' => 'duration', 'type' => 'xsd:string'), // session.duration + 'duration' => array('name' => 'duration', 'type' => 'xsd:string'), // session.human_text_duration 'vacancies' => array('name' => 'vacancies', 'type' => 'xsd:string'), // session.vacancies 'schedule' => array('name' => 'schedule', 'type' => 'xsd:string'), // session.schedule ) diff --git a/tests/scripts/insert_session_fields.php b/tests/scripts/insert_session_fields.php index b4d4e8ad1f..16a0c62371 100644 --- a/tests/scripts/insert_session_fields.php +++ b/tests/scripts/insert_session_fields.php @@ -108,9 +108,9 @@ $isOpenSession->save(array( $duration = new ExtraField('session'); $duration->save(array( - 'field_type' => ExtraField::FIELD_TYPE_INTEGER, - 'field_variable' => 'duration', - 'field_display_text' => get_lang('Duration'), + 'field_type' => ExtraField::FIELD_TYPE_TEXT, + 'field_variable' => 'human_text_duration', + 'field_display_text' => get_lang('DurationInWords'), 'field_visible' => 1, 'field_changeable' => 1 ));