summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBernhard Fröhlich <bernhard@cacert.org>2018-11-19 23:40:15 +0100
committerBernhard Fröhlich <bernhard@cacert.org>2018-11-19 23:40:15 +0100
commit9f8516aa511f46bbed2b862cb8009646e9dd0669 (patch)
tree849f08574641d70513f8a405eae779d5820c3759
parent35199b7bb05951ec51c45ea650aaff632eab1147 (diff)
parentd6ce5013d5388da971ea89282be3bb3ae2ba69cb (diff)
downloadcacert-devel-9f8516aa511f46bbed2b862cb8009646e9dd0669.tar.gz
cacert-devel-9f8516aa511f46bbed2b862cb8009646e9dd0669.tar.xz
cacert-devel-9f8516aa511f46bbed2b862cb8009646e9dd0669.zip
Merge branch 'bug-1442' into testserver-1260testserver-1260
# Conflicts: # includes/notary.inc.php
-rw-r--r--includes/notary.inc.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/notary.inc.php b/includes/notary.inc.php
index b6cee0f..67ca32f 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
- mysqli_query($_SESSION['mconn'],
+ mysqli_query($_SESSION['mconn'],
"update `users` set
`assurer`='0',
`assurer_blocked`='0',
@@ -1663,7 +1663,7 @@ function write_se_log($uid, $adminid, $type, $info, $typeid=1){
$uid = intval($uid);
$adminid = intval($adminid);
$type = mysqli_real_escape_string($_SESSION['mconn'], $type);
- $info = mysqli_real_escape_string($_SESSION['mconn'], g($info);
+ $info = mysqli_real_escape_string($_SESSION['mconn'], g($info));
$typeid = intval($typeid);
$query="insert into `adminlog` (`when`, `uid`, `adminid`,`type`,`information`,`actiontypeid`) values
(Now(), $uid, $adminid, '$type', '$info')";