lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Florian Henry 2014-03-15 22:11:51 +01:00
commit b7bfadd660
1 changed files with 1 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
htdocs/user/class/user.class.php
View File

@ -1496,7 +1496,7 @@ class User extends CommonObject
$outputlangs->load("users"); $outputlangs->load("users");
$outputlangs->load("other"); $outputlangs->load("other");
$subject = $outputlangs->trans("SubjectNewPassword"); $subject = $outputlangs->transnoentitiesnoconv("SubjectNewPassword");
// Define $urlwithroot // Define $urlwithroot
//$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root)); //$urlwithouturlroot=preg_replace('/'.preg_quote(DOL_URL_ROOT,'/').'$/i','',trim($dolibarr_main_url_root));