From: Antoine Musso <hashar@users.mediawiki.org>
Date: Sat, 22 Oct 2005 21:09:14 +0000 (+0000)
Subject: comment
X-Git-Tag: 1.6.0~1359
X-Git-Url: http://git.cyclocoop.org/%7B%24www_url%7Dadmin/password.php?a=commitdiff_plain;h=6a9bca278b7a7b0ed902b293764c788beb431e0a;p=lhc%2Fweb%2Fwiklou.git

comment
---

diff --git a/includes/User.php b/includes/User.php
index a3464564ee..97dd15547a 100644
--- a/includes/User.php
+++ b/includes/User.php
@@ -218,7 +218,11 @@ class User {
 	}
 
 	/**
-	 * does the string match roughly an email address ?
+	 * Does the string match roughly an email address ?
+	 *
+	 * There used to be a regular expression here, it got removed because it
+	 * rejected valid addresses. Actually just check if there is '@' somewhere
+	 * in the given address.
 	 *
 	 * @todo Check for RFC 2822 compilance
 	 * @bug 959
@@ -228,8 +232,6 @@ class User {
 	 * @return bool
 	 */
 	function isValidEmailAddr ( $addr ) {
-		# There used to be a regular expression here, it got removed because it
-		# rejected valid addresses.
 		return ( trim( $addr ) != '' ) &&
 			(false !== strpos( $addr, '@' ) );
 	}