summaryrefslogtreecommitdiff
path: root/www/index.php
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2012-01-10 13:32:37 +0100
committerMichael Tänzer <neo@nhng.de>2012-01-10 13:32:37 +0100
commit923efbdb9d77f2976d2eb6584a1bb922c0cfaf90 (patch)
treeef816048edfdf64d07d33e4e5d55653db8ebdb00 /www/index.php
parentffeed4b555aa9c0088c43d1dbfbd810d3b177c01 (diff)
parent22fb084237713f5041def5161a2df884b1b24f74 (diff)
downloadcacert-devel-bug-985.tar.gz
cacert-devel-bug-985.tar.xz
cacert-devel-bug-985.zip
Merge branch 'release' into bug-985bug-985
Conflicts: www/wot.php Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'www/index.php')
-rw-r--r--www/index.php7
1 files changed, 7 insertions, 0 deletions
diff --git a/www/index.php b/www/index.php
index b8cfbf3..41b6d7a 100644
--- a/www/index.php
+++ b/www/index.php
@@ -627,6 +627,13 @@ require_once('../includes/lib/l10n.php');
if(!array_key_exists('signup',$_SESSION) || $_SESSION['signup']['year'] < 1900)
$_SESSION['signup']['year'] = "19XX";
+
+ if ($id == 12)
+ {
+ $protocol = $_SERVER['HTTPS'] ? 'https' : 'http';
+ $newUrl = $protocol . '://wiki.cacert.org/FAQ/AboutUs';
+ header('Location: '.$newUrl, true, 301); // 301 = Permanently Moved
+ }
if ($id == 19)
{