Author: tdraier
Date: Mon Jun 25 15:14:46 2007
New Revision: 17753
URL: https://svndev.jahia.net/websvn/listing.php?sc=3D1&rev=3D17753&repname=
=3Djahia
Log:
remove test for admin mail (JAHIA-1878) ( backport 17436 )
Modified:
trunk/core/src/java/org/jahia/admin/sites/ManageSites.java
Modified: trunk/core/src/java/org/jahia/admin/sites/ManageSites.java
URL: https://svndev.jahia.net/websvn/diff.php?path=3D/trunk/core/src/java/o=
rg/jahia/admin/sites/ManageSites.java&rev=3D17753&repname=3Djahia
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D
--- trunk/core/src/java/org/jahia/admin/sites/ManageSites.java (original)
+++ trunk/core/src/java/org/jahia/admin/sites/ManageSites.java Mon Jun 25 1=
5:14:46 2007
@@ -589,7 +589,7 @@
adminEmail =3D userProps.getProperty("email");
}
if (adminEmail =3D=3D null) {
- adminEmail =3D "[EMAIL PROTECTED]";
+ adminEmail =3D "";
}
=
// set display message...
@@ -765,9 +765,6 @@
} else if (adminPassword.length() < 4) {
warningMsg =3D JahiaResourceBundle.getAdminResource("org.jahia=
.admin.JahiaDisplayMessage.passwdTooShort.label",
jParams, jParams.getLocale());
- } else if (adminEmail.length() =3D=3D 0) {
- warningMsg =3D JahiaResourceBundle.getAdminResource("org.jahia=
.admin.JahiaDisplayMessage.EmailMustset.label",
- jParams, jParams.getLocale());
} else if (!userManager.isUsernameSyntaxCorrect(adminUsername)) {
warningMsg =3D JahiaResourceBundle.getAdminResource("org.jahia=
.admin.JahiaDisplayMessage.onlyLettersDigitsUnderscoreWithUsername.label",
jParams, jParams.getLocale());
_______________________________________________
cvs_list mailing list
[email protected]
http://lists.jahia.org/cgi-bin/mailman/listinfo/cvs_list
