mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-10 18:54:08 +02:00
Code Issues Releases Wiki Activity

Merge branch 'develop-olympus' into develop

Browse Source 
* 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
This commit is contained in:
Oleg Pudeyev
2011-02-24 20:59:19 -05:00
parent 76ad7c938d 904bcb86a0
commit ee0db1a1d5
7 changed files with 22 additions and 56 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
phpBB/includes/mcp/mcp_post.php
View File

@@ -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);