aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp/mcp_post.php
diff options
context:
space:
mode:
authorOleg Pudeyev <oleg@bsdpower.com>2011-02-24 20:59:19 -0500
committerOleg Pudeyev <oleg@bsdpower.com>2011-02-24 20:59:19 -0500
commitee0db1a1d5f0150016d0971057f889f2366f9856 (patch)
treeb08d0b98244541ba8b31fc3e24f01e883b08bcd2 /phpBB/includes/mcp/mcp_post.php
parent76ad7c938d7834c09c98b6759dca4a196eb3c29b (diff)
parent904bcb86a054ab6256da565098eb9bd8ab20414b (diff)
downloadforums-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/mcp_post.php')
-rw-r--r--phpBB/includes/mcp/mcp_post.php4
1 files changed, 2 insertions, 2 deletions
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);