summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Fröhlich <bernhard@cacert.org>2018-11-18 21:03:18 +0100
committerBernhard Fröhlich <bernhard@cacert.org>2018-11-18 21:03:18 +0100
commit4ff6326c74ec504126a6fb6946aa07a513a77599 (patch)
treee6042b7add7073c4852c539e4d5c612afa517286
parent55fc69a5ce1dd3d227e172e55202061019d93430 (diff)
parentbe0b4afba3e39b3812c4c937d3e94430539f72a8 (diff)
downloadcacert-devel-4ff6326c74ec504126a6fb6946aa07a513a77599.tar.gz
cacert-devel-4ff6326c74ec504126a6fb6946aa07a513a77599.tar.xz
cacert-devel-4ff6326c74ec504126a6fb6946aa07a513a77599.zip
Merge remote-tracking branch 'GuKK/bug-1442' into bug-1442
-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 a4c8ee7..b614379 100644
--- a/includes/notary.inc.php
+++ b/includes/notary.inc.php
@@ -1199,7 +1199,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))