Merge branch '1.3-misc' of github.com:cakephp/cakephp1x into 1.3-misc

cakephp · Jan 5, 2010 · cf69753 · cf69753
2 parents 2aee4b6 + 9d50158
commit cf69753
Showing 1 changed file with 7 additions and 2 deletions.
diff --git a/cake/libs/validation.php b/cake/libs/validation.php
@@ -501,8 +501,13 @@ function email($check, $deep = false, $regex = null) {
 		}
 
 		if ($return === true && preg_match('/@(' . $_this->__pattern['hostname'] . ')$/i', $_this->check, $regs)) {
-			$host = gethostbynamel($regs[1]);
-			return is_array($host);
+			if (function_exists('getmxrr')) {
+				return getmxrr($regs[1], $mxhosts);
+			}
+			if (function_exists('checkdnsrr')) {
+				return checkdnsrr($regs[1], 'MX');
+			}
+			return is_array(gethostbynamel($regs[1]));
 		}
 		return false;
 	}