Merge branch '1.11.x' of github.com:chamilo/chamilo-lms into 1.11.x

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');

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');