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

This commit is contained in:
Mark Story 2010-01-04 23:30:18 -05:00
commit cf697535b7

View file

@ -501,8 +501,13 @@ class Validation extends Object {
} }
if ($return === true && preg_match('/@(' . $_this->__pattern['hostname'] . ')$/i', $_this->check, $regs)) { if ($return === true && preg_match('/@(' . $_this->__pattern['hostname'] . ')$/i', $_this->check, $regs)) {
$host = gethostbynamel($regs[1]); if (function_exists('getmxrr')) {
return is_array($host); return getmxrr($regs[1], $mxhosts);
}
if (function_exists('checkdnsrr')) {
return checkdnsrr($regs[1], 'MX');
}
return is_array(gethostbynamel($regs[1]));
} }
return false; return false;
} }