diff options
| author | Benny Baumann <BenBE@geshi.org> | 2014-11-30 19:03:58 +0100 |
|---|---|---|
| committer | Benny Baumann <BenBE@geshi.org> | 2014-11-30 19:03:58 +0100 |
| commit | 9244bbfbd96e78a71dac48b90e91380e79914082 (patch) | |
| tree | c1e27bf7a0c1fc3d89e10ec18d888a69d5de0547 | |
| parent | fd40b4032e0b9181ae2cec871bcae4dcfb88c9fb (diff) | |
| parent | b388a866c926be68aeb5a9e5bb28b364fa39ad86 (diff) | |
| download | cacert-devel-9244bbfbd96e78a71dac48b90e91380e79914082.tar.gz cacert-devel-9244bbfbd96e78a71dac48b90e91380e79914082.tar.xz cacert-devel-9244bbfbd96e78a71dac48b90e91380e79914082.zip | |
Merge branch 'bug-1318' into testserver-stable
| -rw-r--r-- | includes/general.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/general.php b/includes/general.php index ef94819..9727374 100644 --- a/includes/general.php +++ b/includes/general.php @@ -576,7 +576,7 @@ if(preg_match("/^([a-zA-Z0-9])+([a-zA-Z0-9\+\._-])*@([a-zA-Z0-9_-])+([a-zA-Z0-9\._-]+)+$/" , $email)) { list($username,$domain)=explode('@',$email,2); - $mxhosts = array(); + $mxhostrr = array(); $mxweight = array(); if( !getmxrr($domain, $mxhostrr, $mxweight) ) { $mxhostrr = array($domain); @@ -591,7 +591,7 @@ $mx_host = trim($mxhostrr[$i], '.'); $mx_prio = $mxweight[$i]; if(empty($mxhostprio[$mx_prio])) { - $mxhostprio[$mx_prio] = arraY(); + $mxhostprio[$mx_prio] = array(); } $mxhostprio[$mx_prio][] = $mx_host; } |