Merge branch 'bug-1412' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Tue, 23 Feb 2016 21:02:59 +0000 (22:02 +0100)
committerBenny Baumann <BenBE@geshi.org>
Tue, 23 Feb 2016 21:02:59 +0000 (22:02 +0100)
1  2 
includes/account.php
includes/general.php

@@@ -572,7 -577,7 +579,7 @@@ function buildSubjectFromSession() 
                $addy = array();
                $adds = array();
                if(strtolower(substr($newdom, -4, 3)) != ".jp")
-                       $adds = explode("\n", trim(shell_exec("/usr/bin/whois $newdom|grep \"@\"")));
 -                      $adds = explode("\n", trim(`/usr/bin/whois -- $newdom|grep "@"`));
++                      $adds = explode("\n", trim(shell_exec("/usr/bin/whois -- $newdom|grep \"@\"")));
                if(substr($newdomain, -4) == ".org" || substr($newdomain, -5) == ".info")
                {
                        if(is_array($adds))
Simple merge