From d3084f9e22a40a97a55db1823667f1c177a52612 Mon Sep 17 00:00:00 2001 From: Yannick Warnier Date: Thu, 16 Jan 2020 16:43:03 +0100 Subject: [PATCH 1/2] Global: Fix query to user extra fields in online e-mail editor - refs BT#16487 --- main/inc/email_editor.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/main/inc/email_editor.php b/main/inc/email_editor.php index fdf5458fa7..f71373c35e 100755 --- a/main/inc/email_editor.php +++ b/main/inc/email_editor.php @@ -45,7 +45,7 @@ switch ($action) { $objTemplate = new Template(); $objTemplate->assign('session_name', $sessionName); - $objTemplate->assign('user', api_get_user_info(api_get_user_id(), false, false, true)); + $objTemplate->assign('user', api_get_user_info(api_get_user_id(), false, false, true, true)); $mailTemplate = $objTemplate->get_template('mail/subscribe_me_to_session.tpl'); $emailDest = api_get_setting('emailAdministrator'); From 755ae4b6270670dfbdd3fbe700315fab19c4b199 Mon Sep 17 00:00:00 2001 From: Nicolas Ducoulombier Date: Fri, 17 Jan 2020 22:43:06 +0100 Subject: [PATCH 2/2] Fixing link creation missing session_id to be able to select session specific item in the gradebook -refs BT#16599 --- main/gradebook/lib/fe/linkaddeditform.class.php | 1 + 1 file changed, 1 insertion(+) diff --git a/main/gradebook/lib/fe/linkaddeditform.class.php b/main/gradebook/lib/fe/linkaddeditform.class.php index 7b13def3fd..9148fb408c 100755 --- a/main/gradebook/lib/fe/linkaddeditform.class.php +++ b/main/gradebook/lib/fe/linkaddeditform.class.php @@ -35,6 +35,7 @@ class LinkAddEditForm extends FormValidator } elseif (isset($link_type) && isset($category_object)) { $link = LinkFactory:: create($link_type); $link->set_course_code(api_get_course_id()); + $link->set_session_id(api_get_session_id()); $link->set_category_id($category_object[0]->get_id()); } else { die('LinkAddEditForm error: define link_type/category_object or link_object');