aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/mcp/mcp_logs.php
diff options
context:
space:
mode:
authorMarc Alexander <admin@m-a-styles.de>2018-01-07 11:02:31 +0100
committerMarc Alexander <admin@m-a-styles.de>2018-01-07 11:02:31 +0100
commit1b4bad6583ffa8a7ba8a1e7f5f9c29c5654bba99 (patch)
treed70037f3f547a71e4a6b87bcddb31aeb19db7328 /phpBB/includes/mcp/mcp_logs.php
parent3ae016954212e90032a10d1427c34a4ff9d9637c (diff)
parent182a96f2738316adcb292816a9ac8af0e0cb5866 (diff)
downloadforums-1b4bad6583ffa8a7ba8a1e7f5f9c29c5654bba99.tar
forums-1b4bad6583ffa8a7ba8a1e7f5f9c29c5654bba99.tar.gz
forums-1b4bad6583ffa8a7ba8a1e7f5f9c29c5654bba99.tar.bz2
forums-1b4bad6583ffa8a7ba8a1e7f5f9c29c5654bba99.tar.xz
forums-1b4bad6583ffa8a7ba8a1e7f5f9c29c5654bba99.zip
Merge remote-tracking branch 'upstream/3.2.x' into prep-release-3.2.2
Diffstat (limited to 'phpBB/includes/mcp/mcp_logs.php')
-rw-r--r--phpBB/includes/mcp/mcp_logs.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/mcp/mcp_logs.php b/phpBB/includes/mcp/mcp_logs.php
index c34c915a40..cbc84e8c64 100644
--- a/phpBB/includes/mcp/mcp_logs.php
+++ b/phpBB/includes/mcp/mcp_logs.php
@@ -115,7 +115,7 @@ class mcp_logs
{
if (confirm_box(true))
{
- if ($deletemark && sizeof($marked))
+ if ($deletemark && count($marked))
{
$conditions = array(
'forum_id' => array('IN' => $forum_list),
@@ -221,7 +221,7 @@ class mcp_logs
'IP' => $row['ip'],
'DATE' => $user->format_date($row['time']),
'ACTION' => $row['action'],
- 'DATA' => (sizeof($data)) ? implode(' | ', $data) : '',
+ 'DATA' => (count($data)) ? implode(' | ', $data) : '',
'ID' => $row['id'],
)
);