Merge branch 'bug-1355' into testserver-stable
authorBenny Baumann <BenBE@geshi.org>
Wed, 14 Jan 2015 00:20:06 +0000 (01:20 +0100)
committerBenny Baumann <BenBE@geshi.org>
Wed, 14 Jan 2015 00:20:06 +0000 (01:20 +0100)
Conflicts:
includes/general.php
tverify/index.php

1  2 
includes/account.php
includes/general.php
pages/account/43.php

Simple merge
@@@ -52,8 -46,8 +52,7 @@@
  
        if(array_key_exists('HTTP_HOST',$_SERVER) &&
                        $_SERVER['HTTP_HOST'] != $_SESSION['_config']['normalhostname'] &&
--                      $_SERVER['HTTP_HOST'] != $_SESSION['_config']['securehostname'] &&
-                       $_SERVER['HTTP_HOST'] != $_SESSION['_config']['tverify'])
 -                      $_SERVER['HTTP_HOST'] != "stamp.cacert.org")
++                      $_SERVER['HTTP_HOST'] != $_SESSION['_config']['securehostname'])
        {
                if(array_key_exists('HTTPS',$_SERVER) && $_SERVER['HTTPS'] == "on")
                        header("location: https://".$_SESSION['_config']['normalhostname']);
Simple merge