summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2011-11-24 17:12:57 +0100
committerMichael Tänzer <neo@nhng.de>2011-11-24 17:12:57 +0100
commit8ce107ef51d6fd9618d4275b6bca16678aa6bc75 (patch)
treedea72d37df7ade178f6729ecd64c6ca2b92a3171 /includes
parentab9b6452a8752f473c20b07f5efa78fe8f97e1a3 (diff)
parent57b85e209da09da2e21b666aebce41b85e56d446 (diff)
downloadcacert-devel-8ce107ef51d6fd9618d4275b6bca16678aa6bc75.tar.gz
cacert-devel-8ce107ef51d6fd9618d4275b6bca16678aa6bc75.tar.xz
cacert-devel-8ce107ef51d6fd9618d4275b6bca16678aa6bc75.zip
Merge branch 'bug-965' into release
Diffstat (limited to 'includes')
-rw-r--r--includes/account_stuff.php2
-rw-r--r--includes/general_stuff.php2
-rw-r--r--includes/tverify_stuff.php2
3 files changed, 3 insertions, 3 deletions
diff --git a/includes/account_stuff.php b/includes/account_stuff.php
index b6fdd7a..108bd57 100644
--- a/includes/account_stuff.php
+++ b/includes/account_stuff.php
@@ -277,7 +277,7 @@ function hideall() {
?>
</div>
</div>
- <div id="siteInfo"><a href="account.php?id=37"><?=_("About Us")?></a> | <a href="account.php?id=38"><?=_("Donations")?></a> | <a href="http://wiki.cacert.org/wiki/CAcertIncorporated"><?=_("Association Membership")?></a> |
+ <div id="siteInfo"><a href="//wiki.cacert.org/FAQ/AboutUs"><?=_("About Us")?></a> | <a href="account.php?id=38"><?=_("Donations")?></a> | <a href="http://wiki.cacert.org/wiki/CAcertIncorporated"><?=_("Association Membership")?></a> |
<a href="/policy/PrivacyPolicy.html"><?=_("Privacy Policy")?></a> | <a href="account.php?id=40"><?=_("Contact Us")?></a>
| &copy;2002-<?=date("Y")?> <?=_("by CAcert")?></div>
</div>
diff --git a/includes/general_stuff.php b/includes/general_stuff.php
index 088c39e..80cd8a7 100644
--- a/includes/general_stuff.php
+++ b/includes/general_stuff.php
@@ -131,7 +131,7 @@ if(!function_exists("showfooter"))
</div>
<? include("sponsorinfo.php") ?>
<div id="siteInfo">
- <a href="/index.php?id=12"><?=_("About Us")?></a> | <a href="/index.php?id=13"><?=_("Donations")?></a> | <a href="http://wiki.cacert.org/wiki/CAcertIncorporated"><?=_("Association Membership")?></a> |
+ <a href="//wiki.cacert.org/FAQ/AboutUs"><?=_("About Us")?></a> | <a href="/index.php?id=13"><?=_("Donations")?></a> | <a href="http://wiki.cacert.org/wiki/CAcertIncorporated"><?=_("Association Membership")?></a> |
<a href="/policy/PrivacyPolicy.html"><?=_("Privacy Policy")?></a> |
<a href="/index.php?id=51"><?=_("Mission Statement")?></a> | <a href="/index.php?id=11"><?=_("Contact Us")?></a> |
&copy;2002-<?=date("Y")?> <?=_("by CAcert")?></div>
diff --git a/includes/tverify_stuff.php b/includes/tverify_stuff.php
index 46f49f6..93f7c32 100644
--- a/includes/tverify_stuff.php
+++ b/includes/tverify_stuff.php
@@ -66,7 +66,7 @@ if(!function_exists("showfooter"))
</div>
</div>
<div id="siteInfo">
- <a href="/index.php?id=12"><?=_("About Us")?></a> | <a href="/index.php?id=13"><?=_("Donations")?></a> | <a href="http://wiki.cacert.org/wiki/CAcertIncorporated"><?=_("Association Membership")?></a> |
+ <a href="//wiki.cacert.org/FAQ/AboutUs"><?=_("About Us")?></a> | <a href="/index.php?id=13"><?=_("Donations")?></a> | <a href="http://wiki.cacert.org/wiki/CAcertIncorporated"><?=_("Association Membership")?></a> |
<a href="/index.php?id=10"><?=_("Privacy Policy")?></a> |
<a href="/index.php?id=51"><?=_("Mission Statement")?></a> | <a href="/index.php?id=11"><?=_("Contact Us")?></a> |
<a href="/index.php?id=19"><?=_("Further Information")?></a> | &copy;2002-<?=date("Y")?> <?=_("by CAcert")?></div>