summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorBenny Baumann <BenBE@geshi.org>2015-06-02 22:01:07 +0200
committerBenny Baumann <BenBE@geshi.org>2015-06-02 22:01:07 +0200
commitbf55612a197070a13d24823686bd6f2ea5f8211b (patch)
tree1bb614d5fb3d5a04a0b7090de9d86bed592aaf1d
parent3abe7dcec217fd183e042e66e4356738af019e41 (diff)
parentd2cd5782146fa5a7324d9f4c2f197d153810167c (diff)
downloadcacert-devel-bf55612a197070a13d24823686bd6f2ea5f8211b.tar.gz
cacert-devel-bf55612a197070a13d24823686bd6f2ea5f8211b.tar.xz
cacert-devel-bf55612a197070a13d24823686bd6f2ea5f8211b.zip
Merge branch 'bug-1316' into bug-1050bug-1050
-rw-r--r--pages/account/43.php6
1 files changed, 3 insertions, 3 deletions
diff --git a/pages/account/43.php b/pages/account/43.php
index 2774fb2..e5d5a42 100644
--- a/pages/account/43.php
+++ b/pages/account/43.php
@@ -112,8 +112,8 @@ if(intval(array_key_exists('userid',$_REQUEST)?$_REQUEST['userid']:0) <= 0)
// display user information for given user id
if(intval($_REQUEST['userid']) > 0) {
$userid = intval($_REQUEST['userid']);
- $res =get_user_data($userid);
- if(mysql_num_rows($res) <= 0) {
+ $user_data_res =get_user_data($userid);
+ if(mysql_num_rows($user_data_res) <= 0) {
echo _("I'm sorry, the user you were looking for seems to have disappeared! Bad things are afoot!");
} else {
@@ -137,7 +137,7 @@ if(intval($_REQUEST['userid']) > 0) {
$ticketmsg=_('No assurance revoked. Ticket number is missing!');
}
- $row = mysql_fetch_assoc($res);
+ $row = mysql_fetch_assoc($user_data_res);
$query = "select sum(`points`) as `points` from `notary` where `to`='".intval($row['id'])."' and `deleted` = 0";
$dres = mysql_query($query);
$drow = mysql_fetch_assoc($dres);