diff options
| author | Oleg Pudeyev <oleg@bsdpower.com> | 2011-02-24 20:59:19 -0500 |
|---|---|---|
| committer | Oleg Pudeyev <oleg@bsdpower.com> | 2011-02-24 20:59:19 -0500 |
| commit | ee0db1a1d5f0150016d0971057f889f2366f9856 (patch) | |
| tree | b08d0b98244541ba8b31fc3e24f01e883b08bcd2 /phpBB/includes/acp | |
| parent | 76ad7c938d7834c09c98b6759dca4a196eb3c29b (diff) | |
| parent | 904bcb86a054ab6256da565098eb9bd8ab20414b (diff) | |
| download | forums-ee0db1a1d5f0150016d0971057f889f2366f9856.tar forums-ee0db1a1d5f0150016d0971057f889f2366f9856.tar.gz forums-ee0db1a1d5f0150016d0971057f889f2366f9856.tar.bz2 forums-ee0db1a1d5f0150016d0971057f889f2366f9856.tar.xz forums-ee0db1a1d5f0150016d0971057f889f2366f9856.zip | |
Merge branch 'develop-olympus' into develop
* develop-olympus:
[ticket/9874] view_log() performs unneeded count query over all log entries.
[ticket/7834] Topic time didn't update when first post was deleted
[ticket/9997] Fixed an inconsistency in the Moderator Control Panel
[ticket/9872] Removed some useless code that broke delete_posts
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_main.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/acp/acp_main.php b/phpBB/includes/acp/acp_main.php index a154aa5039..ac375838fd 100644 --- a/phpBB/includes/acp/acp_main.php +++ b/phpBB/includes/acp/acp_main.php @@ -529,7 +529,7 @@ class acp_main ); $log_data = array(); - $log_count = 0; + $log_count = false; if ($auth->acl_get('a_viewlogs')) { |