1
0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00

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
This commit is contained in:
Oleg Pudeyev
2011-02-24 20:59:19 -05:00
7 changed files with 22 additions and 56 deletions

View File

@@ -529,7 +529,7 @@ class acp_main
);
$log_data = array();
$log_count = 0;
$log_count = false;
if ($auth->acl_get('a_viewlogs'))
{