Merge remote branch 'kc/master'

This commit is contained in:
Chris Cormack 2010-07-15 09:08:57 +12:00
commit b2112eac49

View file

@ -460,7 +460,7 @@ sub execute_query ($;$$$) {
if (defined($userlimit)) {
if ($offset + $limit > $userlimit ) {
$limit = $userlimit - $offset;
} elsif ( ! $offset && $limit > $userlimit ) {
} elsif ( ! $offset && $limit < $userlimit ) {
$limit = $userlimit;
}
}