summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2013-09-03 23:40:30 +0200
committerMichael Tänzer <neo@nhng.de>2013-09-03 23:40:30 +0200
commit08bb2eb7d88af7cee99e680e950da5a823767c3b (patch)
treef70d05357c7458f1f0f4165beba58a22e288fd34
parent445ba1e920c4a2f58bd9ef86cc8601113810cf5e (diff)
parent24603f28cde091813d8022daa9153eb4ab685ca4 (diff)
downloadcacert-devel-merge-bug-1177-893-1136-1123-1137-testserver.tar.gz
cacert-devel-merge-bug-1177-893-1136-1123-1137-testserver.tar.xz
cacert-devel-merge-bug-1177-893-1136-1123-1137-testserver.zip
Merge branch 'merge-bug-1177-893-1136-1123-1137' into merge-bug-1177-893-1136-1123-1137-testservermerge-bug-1177-893-1136-1123-1137-testserver
-rw-r--r--includes/notary.inc.php8
-rw-r--r--www/wot.php2
2 files changed, 2 insertions, 8 deletions
diff --git a/includes/notary.inc.php b/includes/notary.inc.php
index 571d73b..37a7ed0 100644
--- a/includes/notary.inc.php
+++ b/includes/notary.inc.php
@@ -726,12 +726,6 @@
<?
}
- function AssureCCABoxLine($type,$text)
- {
- return;
- AssureBoxLine($type,$text);
- }
-
function AssureBoxLine($type,$text,$checked)
{
?>
@@ -1024,7 +1018,7 @@
$mailid = intval($mailid);
$query = "select `emailcerts`.`id`
from `emaillink`,`emailcerts` where
- `emailid`='$mailid' and `emaillink`.`emailcertsid`=`emailcerts`.`id` and `revoked`=0
+ `emaillink`.`emailid`='$mailid' and `emaillink`.`emailcertsid`=`emailcerts`.`id` and `emailcerts`.`revoked`=0
group by `emailcerts`.`id`";
$dres = mysql_query($query);
while($drow = mysql_fetch_assoc($dres)){
diff --git a/www/wot.php b/www/wot.php
index 9b6bd27..8395a58 100644
--- a/www/wot.php
+++ b/www/wot.php
@@ -277,7 +277,7 @@ $iecho= "c";
exit;
}
- //met assuree in person, not appliciable fot TTP / TTP Topup assurances
+ //met assuree in person, not appliciable for TTP / TTP Topup assurances
if((!array_key_exists('certify',$_POST) || $_POST['certify'] != 1 ) && $_REQUEST['method'] != "Trusted 3rd Parties")
{
show_page("VerifyData","",_("You failed to check all boxes to validate your adherence to the rules and policies of CAcert"));