Merge branch 'bug-1318' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Sat, 29 Nov 2014 14:08:22 +0000 (15:08 +0100)
committerBenny Baumann <BenBE@geshi.org>
Sat, 29 Nov 2014 14:08:22 +0000 (15:08 +0100)
includes/general.php

index f7b50f5..70031f4 100644 (file)
                        }
 
                        array_walk($mxhostprio, function(&$mx) { shuffle($mx); } );
+                       ksort($mxhostprio);
 
                        $mxhosts = array();
                        foreach($mxhostprio as $mx_prio => $mxhostnames) {