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/mcp | |
| 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/mcp')
| -rw-r--r-- | phpBB/includes/mcp/mcp_front.php | 2 | ||||
| -rw-r--r-- | phpBB/includes/mcp/mcp_post.php | 4 |
2 files changed, 3 insertions, 3 deletions
diff --git a/phpBB/includes/mcp/mcp_front.php b/phpBB/includes/mcp/mcp_front.php index 1b0ddf1f4d..7375e20d96 100644 --- a/phpBB/includes/mcp/mcp_front.php +++ b/phpBB/includes/mcp/mcp_front.php @@ -350,7 +350,7 @@ function mcp_front_view($id, $mode, $action) // Add forum_id 0 for global announcements $forum_list[] = 0; - $log_count = 0; + $log_count = false; $log = array(); view_log('mod', $log, $log_count, 5, 0, $forum_list); diff --git a/phpBB/includes/mcp/mcp_post.php b/phpBB/includes/mcp/mcp_post.php index ba3ed33b9f..4e0aae1870 100644 --- a/phpBB/includes/mcp/mcp_post.php +++ b/phpBB/includes/mcp/mcp_post.php @@ -227,10 +227,10 @@ function mcp_post_details($id, $mode, $action) // Get User Notes $log_data = array(); - $log_count = 0; + $log_count = false; view_log('user', $log_data, $log_count, $config['posts_per_page'], 0, 0, 0, $post_info['user_id']); - if ($log_count) + if (!empty($log_data)) { $template->assign_var('S_USER_NOTES', true); |