summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Fröhlich <bernhard@cacert.org>2018-11-18 21:04:57 +0100
committerBernhard Fröhlich <bernhard@cacert.org>2018-11-18 21:04:57 +0100
commitd190cba9ceefd37acd94770f10ddb26d77b07b7e (patch)
tree7abe222a4af745d40bfc7613ef2eb2be8d67d45d
parent9bfcbee138087d343bc50aa7a5dd652a230add3b (diff)
parent4ff6326c74ec504126a6fb6946aa07a513a77599 (diff)
downloadcacert-devel-d190cba9ceefd37acd94770f10ddb26d77b07b7e.tar.gz
cacert-devel-d190cba9ceefd37acd94770f10ddb26d77b07b7e.tar.xz
cacert-devel-d190cba9ceefd37acd94770f10ddb26d77b07b7e.zip
Merge branch 'bug-1442' into testserver-1260
# Conflicts: # includes/notary.inc.php
-rw-r--r--includes/notary.inc.php2
-rw-r--r--scripts/58at-ate-wien-mail.php.txt2
2 files changed, 2 insertions, 2 deletions
diff --git a/includes/notary.inc.php b/includes/notary.inc.php
index 31796d7..f931bd8 100644
--- a/includes/notary.inc.php
+++ b/includes/notary.inc.php
@@ -1258,7 +1258,7 @@ function get_user_agreements($memid, $type=null, $active=null){
mysqli_query($_SESSION['mconn'], $query);
//clear all admin and board flags
- mmysqli_query($_SESSION['mconn'],
+ mysqli_query($_SESSION['mconn'],
"update `users` set
`assurer`='0',
`assurer_blocked`='0',
diff --git a/scripts/58at-ate-wien-mail.php.txt b/scripts/58at-ate-wien-mail.php.txt
index 2a17dd4..02e3a25 100644
--- a/scripts/58at-ate-wien-mail.php.txt
+++ b/scripts/58at-ate-wien-mail.php.txt
@@ -114,7 +114,7 @@
// comment next line when starting to send mail not only to me
// $query = "select * from `users` where `email` like 'cacerttest%'";
- $res = mmysqli_query($_SESSION['mconn'], $query);
+ $res = mysqli_query($_SESSION['mconn'], $query);
$xrows = mysqli_num_rows($res);
while($row = mysqli_fetch_assoc($res))