diff --git a/public/main/inc/lib/api.lib.php b/public/main/inc/lib/api.lib.php
index 105e462955..e703ab4970 100644
--- a/public/main/inc/lib/api.lib.php
+++ b/public/main/inc/lib/api.lib.php
@@ -7119,8 +7119,8 @@ function api_mail_html(
}
$message
- ->htmlTemplate('ChamiloCoreBundle:Mailer:Default/default.html.twig')
- ->textTemplate('ChamiloCoreBundle:Mailer:Default/default.text.twig')
+ ->htmlTemplate('@ChamiloCore/Mailer/Default/default.html.twig')
+ ->textTemplate('@ChamiloCore/Mailer/Default/default.text.twig')
;
$message->context($params);
Container::getMailer()->send($message);
diff --git a/public/main/inc/lib/usermanager.lib.php b/public/main/inc/lib/usermanager.lib.php
index e0b6fcf266..103c5d6088 100644
--- a/public/main/inc/lib/usermanager.lib.php
+++ b/public/main/inc/lib/usermanager.lib.php
@@ -1164,8 +1164,7 @@ class UserManager
$tplContent->assign('original_password', $originalPassword);
$tplContent->assign('portal_url', $url);
- $layoutContent = $tplContent->get_template('mail/user_edit_content.tpl');
- $emailBody = $tplContent->fetch($layoutContent);
+ $emailBody = $tplContent->fetch('@ChamiloCore/Mailer/Legacy/user_edit_content.html.twig');
$mailTemplateManager = new MailTemplateManager();
@@ -1195,14 +1194,6 @@ class UserManager
);
}
- $cacheAvailable = api_get_configuration_value('apc');
- if (true === $cacheAvailable) {
- $apcVar = api_get_configuration_value('apc_prefix').'userinfo_'.$user_id;
- if (apcu_exists($apcVar)) {
- apcu_delete($apcVar);
- }
- }
-
return $user->getId();
}
diff --git a/src/CoreBundle/Resources/views/Mailer/Default/default.html.twig b/src/CoreBundle/Resources/views/Mailer/Default/default.html.twig
index 10c74e2899..049fa69513 100644
--- a/src/CoreBundle/Resources/views/Mailer/Default/default.html.twig
+++ b/src/CoreBundle/Resources/views/Mailer/Default/default.html.twig
@@ -2,7 +2,9 @@
- {{ _s.institution }}
+
+ {{ 'platform.site_name' | api_get_setting }}
+