aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2014-11-22 12:08:42 +0100
committerJoas Schilling <nickvergessen@gmx.de>2014-11-22 12:08:42 +0100
commitccad0172148483fdbffd83bbaf8ee8dd7044c374 (patch)
tree96a0228fa5e286fbd50463e9b1db4323f8e2579b /phpBB
parentcde2f01b658708ec0bea22c60322d6cedbe333ee (diff)
parenta83b952f63b244e55471a78453aa54febe822565 (diff)
downloadforums-ccad0172148483fdbffd83bbaf8ee8dd7044c374.tar
forums-ccad0172148483fdbffd83bbaf8ee8dd7044c374.tar.gz
forums-ccad0172148483fdbffd83bbaf8ee8dd7044c374.tar.bz2
forums-ccad0172148483fdbffd83bbaf8ee8dd7044c374.tar.xz
forums-ccad0172148483fdbffd83bbaf8ee8dd7044c374.zip
Merge branch 'develop-ascraeus' into develop
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/mcp/mcp_logs.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/includes/mcp/mcp_logs.php b/phpBB/includes/mcp/mcp_logs.php
index 92dcdb5499..9c76f0df90 100644
--- a/phpBB/includes/mcp/mcp_logs.php
+++ b/phpBB/includes/mcp/mcp_logs.php
@@ -137,7 +137,7 @@ class mcp_logs
if ($mode == 'topic_logs')
{
- $conditions['topic_logs'] = $topic_id;
+ $conditions['topic_id'] = $topic_id;
}
$phpbb_log->delete('mod', $conditions);