Merge branch '3.5' of https://github.com/Dolibarr/dolibarr.git into 3.5

Dolibarr · Mar 15, 2014 · b7bfadd · b7bfadd
2 parents 649f535 + de59f3a
commit b7bfadd
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/htdocs/user/class/user.class.php b/htdocs/user/class/user.class.php
@@ -1496,7 +1496,7 @@ function send_password($user, $password='', $changelater=0)
 		$outputlangs->load("users");
 		$outputlangs->load("other");
 
-		$subject = $outputlangs->trans("SubjectNewPassword");
+		$subject = $outputlangs->transnoentitiesnoconv("SubjectNewPassword");
 
 		// Define $urlwithroot
 		//$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));