summaryrefslogtreecommitdiff
path: root/pages/gpg/2.php
diff options
context:
space:
mode:
authorMichael Tänzer <neo@nhng.de>2014-04-07 01:06:20 +0200
committerMichael Tänzer <neo@nhng.de>2014-04-07 01:06:20 +0200
commit7aced7401aa7f21bb2f39d0d28f92b22bba3a068 (patch)
tree659565ca9dc17ddad7990dd9e9134fb2a9894efc /pages/gpg/2.php
parentefcc291e3a7e1413bf6340ba76ae1ae11b62b05f (diff)
downloadcacert-devel-7aced7401aa7f21bb2f39d0d28f92b22bba3a068.tar.gz
cacert-devel-7aced7401aa7f21bb2f39d0d28f92b22bba3a068.tar.xz
cacert-devel-7aced7401aa7f21bb2f39d0d28f92b22bba3a068.zip
bug 1138: don't alias columns that could cause ambiguities
Signed-off-by: Michael Tänzer <neo@nhng.de>
Diffstat (limited to 'pages/gpg/2.php')
-rw-r--r--pages/gpg/2.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/pages/gpg/2.php b/pages/gpg/2.php
index cc8a872..54d2bb2 100644
--- a/pages/gpg/2.php
+++ b/pages/gpg/2.php
@@ -30,7 +30,7 @@
$query = "select UNIX_TIMESTAMP(`issued`) as `issued`,
UNIX_TIMESTAMP(`expire`) - UNIX_TIMESTAMP() as `timeleft`,
UNIX_TIMESTAMP(`expire`) as `expired`,
- `expire` as `expires`, `id`, `level`,
+ `expire`, `id`, `level`,
`email`,`keyid`,`description` from `gpg` where `memid`='".intval($_SESSION['profile']['id'])."'
ORDER BY `issued` desc";
$res = mysql_query($query);
@@ -61,7 +61,7 @@
<td class="DataTD"><?=$verified?></td>
<td class="DataTD"><a href="gpg.php?id=3&amp;cert=<?=$row['id']?>"><?=$row['email']?></a></td>
<? } ?>
- <td class="DataTD"><?=$row['expires']?></td>
+ <td class="DataTD"><?=$row['expire']?></td>
<td class="DataTD"><a href="gpg.php?id=3&amp;cert=<?=$row['id']?>"><?=$row['keyid']?></a></td>
<td class="DataTD"><input name="comment_<?=$row['id']?>" type="text" value="<?=htmlspecialchars($row['description'])?>" /></td>
<td class="DataTD"><input type="checkbox" name="check_comment_<?=$row['id']?>" /></td>