Merge branch 'master' into dist/eole/2.7.2/master

Fix llResetUrl bugé
2020-11-20 14:45:38 +01:00 · 2020-11-20 14:44:51 +01:00
1 changed files with 4 additions and 2 deletions
--- a/tmpl/lmConf-1.js
+++ b/tmpl/lmConf-1.js
@ -392,10 +392,12 @@
    "oidcOPMetaDataJWKS": null,
    "webIDAuthnLevel": 1,
    "issuerDBOpenIDActivation": "1",
-%if %%is_empty(%%llResetUrl)    
+%if %%llResetPassword == "oui"
+  %if %%is_empty(%%llResetUrl)    
    "mailUrl": "https://%%authWebName/mail.pl",
-%else
+  %else
    "mailUrl": "%%llResetUrl",
+  %end if
 %end if
    "maintenance": 0,
    "jsRedirect": 0,
Author	SHA1	Message	Date
Philippe Caseiro	0a5f0f7d94	Merge branch 'master' into dist/eole/2.7.2/master	2020-11-20 14:45:38 +01:00
Philippe Caseiro	beb6341981	Fix llResetUrl bugé	2020-11-20 14:44:51 +01:00