diff options
author | Benny Baumann <BenBE@geshi.org> | 2015-04-30 00:52:25 +0200 |
---|---|---|
committer | Benny Baumann <BenBE@geshi.org> | 2015-04-30 00:52:25 +0200 |
commit | e6c30671e0e2515e627372ad96021f2973faa41d (patch) | |
tree | b5dc64533e9c996acdfc30111049679bfd34c4df /pages | |
parent | f0cdbfab3852d7bad78df54d4c474ca2f6b0f736 (diff) | |
parent | 8e447dced0b5906a132d74870539fc639d3cc202 (diff) | |
download | cacert-devel-e6c30671e0e2515e627372ad96021f2973faa41d.tar.gz cacert-devel-e6c30671e0e2515e627372ad96021f2973faa41d.tar.xz cacert-devel-e6c30671e0e2515e627372ad96021f2973faa41d.zip |
Merge branch 'bug-1060' into bug-1042
Diffstat (limited to 'pages')
-rw-r--r-- | pages/wot/1.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/pages/wot/1.php b/pages/wot/1.php index 9047f27..df6b3c3 100644 --- a/pages/wot/1.php +++ b/pages/wot/1.php @@ -92,7 +92,8 @@ $query = "select *, `users`.`id` as `id` from `users`,`notary` where `listme`='1' and `ccid`='".$ccid."' and `regid`='".$regid."' and `locid`='".$locid."' and `users`.`id`=`notary`.`to` and `notary`.`deleted`=0 - group by `notary`.`to` HAVING SUM(`points`) >= 100 order by `points` desc"; + AND `notary`.`method` != 'Administrative Increase' AND `notary`.`from` != `notary`.`to` + group by `notary`.`to` HAVING SUM(`awarded`) >= 100 order by `points` desc"; $list = mysql_query($query); if(mysql_num_rows($list) > 0) { |