summaryrefslogtreecommitdiff
path: root/includes
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2013-06-11 22:33:34 +0200
committerBenny Baumann <BenBE@geshi.org>2013-06-11 22:33:34 +0200
commit216271b2501cba5ac2724c56588fa62c725d1d69 (patch)
tree92ac053ba899c2195f411eff5bd8d01cb869c337 /includes
parent0913b852c9e7a335cc2700f6f7d573565218c9dc (diff)
parentf0318d79dbc69e444fee4c085cdb3ee152318e1c (diff)
downloadcacert-devel-216271b2501cba5ac2724c56588fa62c725d1d69.tar.gz
cacert-devel-216271b2501cba5ac2724c56588fa62c725d1d69.tar.xz
cacert-devel-216271b2501cba5ac2724c56588fa62c725d1d69.zip
Merge branch 'bug-1162' into testserver-stable
Conflicts: www/wot.php
Diffstat (limited to 'includes')
-rw-r--r--includes/lib/general.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/includes/lib/general.php b/includes/lib/general.php
index 85b132d..32a24bc 100644
--- a/includes/lib/general.php
+++ b/includes/lib/general.php
@@ -32,9 +32,9 @@
function get_user_id_from_cert($serial, $issuer_cn)
{
$query = "select `memid` from `emailcerts` where
- `serial`='".mysql_escape_string($serial)."' and
+ `serial`='".mysql_real_escape_string($serial)."' and
`rootcert`= (select `id` from `root_certs` where
- `Cert_Text`='".mysql_escape_string($issuer_cn)."') and
+ `Cert_Text`='".mysql_real_escape_string($issuer_cn)."') and
`revoked`=0 and disablelogin=0 and
UNIX_TIMESTAMP(`expire`) - UNIX_TIMESTAMP() > 0";
$res = mysql_query($query);