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

main/install/configuration.dist.php

@@ -1054,7 +1054,7 @@ ALTER TABLE portfolio_comment ADD CONSTRAINT FK_C2C17DA2727ACA70 FOREIGN KEY (pa
 ALTER TABLE portfolio_category ADD parent_id INT(11) NOT NULL DEFAULT 0;
 */
 // In 1.11.8, before enabling this feature, you also need to:
-// - edit src/Chamilo/CoreBundle/Entity/Portfolio.php and PortfolioCategory.php
+// - edit src/Chamilo/CoreBundle/Entity/Portfolio.php, PortfolioCategory.php, PortfolioAttachment.php and PortfolioComment.php
 //   and follow the instructions about the @ORM\Entity() line
 // - launch composer install to rebuild the autoload.php
 //$_configuration['allow_portfolio_tool'] = false;

plugin/azure_active_directory/src/callback.php

@@ -170,10 +170,9 @@ try {
     exit;
 }
 
-$_user['user_id'] = $userInfo['user_id'];
-$_user['uidReset'] = true;
+$userInfo['uidReset'] = true;
 
-ChamiloSession::write('_user', $_user);
+ChamiloSession::write('_user', $userInfo);
 ChamiloSession::write('_user_auth_source', 'azure_active_directory');
 Event::eventLogin($userInfo['user_id']);
 Redirect::session_request_uri(true, $userInfo['user_id']);

plugin/oauth2/src/callback.php

@@ -80,10 +80,9 @@ try {
 
 ConditionalLogin::check_conditions($userInfo);
 
-$_user['user_id'] = $userInfo['user_id'];
-$_user['uidReset'] = true;
+$userInfo['uidReset'] = true;
 
-ChamiloSession::write('_user', $_user);
+ChamiloSession::write('_user', $userInfo);
 ChamiloSession::write('_user_auth_source', 'oauth2');
 
 Redirect::session_request_uri(true, $userInfo['user_id']);