summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Fröhlich <bernhard@cacert.org>2012-01-19 19:59:54 +0100
committerBernhard Fröhlich <bernhard@cacert.org>2012-01-19 19:59:54 +0100
commitf712965620c90c1d1a8213ef7b27acadc41002db (patch)
tree74bb145a3752a43c25598da9dfe389e2d1584966
parent22fb084237713f5041def5161a2df884b1b24f74 (diff)
parentb87800efc6d6309f0487bee2f3c3491f58846132 (diff)
downloadcacert-devel-f712965620c90c1d1a8213ef7b27acadc41002db.tar.gz
cacert-devel-f712965620c90c1d1a8213ef7b27acadc41002db.tar.xz
cacert-devel-f712965620c90c1d1a8213ef7b27acadc41002db.zip
Merge branch 'bug-855' into release
-rw-r--r--pages/wot/6.php4
-rw-r--r--www/wot.php2
2 files changed, 3 insertions, 3 deletions
diff --git a/pages/wot/6.php b/pages/wot/6.php
index bc37aa2..f8be9d7 100644
--- a/pages/wot/6.php
+++ b/pages/wot/6.php
@@ -29,9 +29,9 @@
if($_SESSION['profile']['ttpadmin'] == 1 && $_SESSION['profile']['board'] == 1)
{
- $methods = array("Face to Face Meeting", "Trusted 3rd Parties", "Thawte Points Transfer", "Administrative Increase", "CT Magazine - Germany");
+ $methods = array("Face to Face Meeting", "Trusted Third Parties", "Thawte Points Transfer", "Administrative Increase", "CT Magazine - Germany");
} else if($_SESSION['profile']['ttpadmin'] == 1) {
- $methods = array("Face to Face Meeting", "Trusted 3rd Parties");
+ $methods = array("Face to Face Meeting", "Trusted Third Parties");
}
$cap = "/cap.php?";
diff --git a/www/wot.php b/www/wot.php
index fe3b93b..d70f1d5 100644
--- a/www/wot.php
+++ b/www/wot.php
@@ -297,7 +297,7 @@ $iecho= "c";
$query .= ",\n`sponsor`='".intval($_POST['sponsor'])."'";
} else if($_SESSION['profile']['board'] == 1) {
$query .= ",\n`method`='".mysql_escape_string(stripslashes($_POST['method']))."'";
- } else if($_SESSION['profile']['ttpadmin'] == 1 && ($_POST['method'] == 'Trusted 3rd Parties' || $_POST['method'] == 'Trusted third Parties')) {
+ } else if($_SESSION['profile']['ttpadmin'] == 1 && ($_POST['method'] == 'Trusted 3rd Parties' || $_POST['method'] == 'Trusted Third Parties')) {
$query .= ",\n`method`='Trusted Third Parties'";
}
mysql_query($query);