Merge branch 'bug-1318' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sun, 30 Nov 2014 18:03:58 +0000 (19:03 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sun, 30 Nov 2014 18:03:58 +0000 (19:03 +0100)
includes/general.php

index ef94819..9727374 100644 (file)
                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);
                                $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;
                        }