diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-11-23 20:38:58 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-11-23 20:38:58 -0500 |
| commit | 74bca1d97b8bc8f4e5e571bff4edbf022820e54e (patch) | |
| tree | aded78129c1355f9a2c3ef42203adaa1959a1a44 /phpBB/includes/functions_admin.php | |
| parent | 4cd88199c932d18cbf39259f8c216fec81a5a441 (diff) | |
| parent | a72ea2bc98bd75bf02414e6e5c7723c9ec47a97d (diff) | |
| download | forums-74bca1d97b8bc8f4e5e571bff4edbf022820e54e.tar forums-74bca1d97b8bc8f4e5e571bff4edbf022820e54e.tar.gz forums-74bca1d97b8bc8f4e5e571bff4edbf022820e54e.tar.bz2 forums-74bca1d97b8bc8f4e5e571bff4edbf022820e54e.tar.xz forums-74bca1d97b8bc8f4e5e571bff4edbf022820e54e.zip | |
Merge remote-tracking branch 'bantu/ticket/10461' into prep-release-3.0.10
* bantu/ticket/10461:
[ticket/10461] Add a comment explaining the logic here.
[ticket/10461] Correct $log_count check in view_log() so we show logs again.
Diffstat (limited to 'phpBB/includes/functions_admin.php')
| -rw-r--r-- | phpBB/includes/functions_admin.php | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/phpBB/includes/functions_admin.php b/phpBB/includes/functions_admin.php index 513b7a68b2..526bc16ff0 100644 --- a/phpBB/includes/functions_admin.php +++ b/phpBB/includes/functions_admin.php @@ -2609,7 +2609,11 @@ function view_log($mode, &$log, &$log_count, $limit = 0, $offset = 0, $forum_id $db->sql_freeresult($result); } - if ($log_count == 0) + // $log_count may be false here if false was passed in for it, + // because in this case we did not run the COUNT() query above. + // If we ran the COUNT() query and it returned zero rows, return; + // otherwise query for logs below. + if ($log_count === 0) { // Save the queries, because there are no logs to display return 0; |