aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/acp
diff options
context:
space:
mode:
authorNathan Guse <nathaniel.guse@gmail.com>2012-07-22 14:39:10 -0500
committerNathan Guse <nathaniel.guse@gmail.com>2012-07-22 14:39:10 -0500
commiteb5e33a7683e7eebaa5c180c00693d5d061c057c (patch)
tree85d393cc8777377731b7dd9844f13e95f0a1d623 /phpBB/includes/acp
parent67665f59577092badf7eb0b5585e5ae39c52c8da (diff)
downloadforums-eb5e33a7683e7eebaa5c180c00693d5d061c057c.tar
forums-eb5e33a7683e7eebaa5c180c00693d5d061c057c.tar.gz
forums-eb5e33a7683e7eebaa5c180c00693d5d061c057c.tar.bz2
forums-eb5e33a7683e7eebaa5c180c00693d5d061c057c.tar.xz
forums-eb5e33a7683e7eebaa5c180c00693d5d061c057c.zip
[ticket/10990] Do not use comma separator when storing it as a log.
PHPBB3-10990
Diffstat (limited to 'phpBB/includes/acp')
-rw-r--r--phpBB/includes/acp/acp_attachments.php4
-rw-r--r--phpBB/includes/acp/acp_bots.php2
-rw-r--r--phpBB/includes/acp/acp_email.php2
-rw-r--r--phpBB/includes/acp/acp_prune.php2
4 files changed, 5 insertions, 5 deletions
diff --git a/phpBB/includes/acp/acp_attachments.php b/phpBB/includes/acp/acp_attachments.php
index 18a685c9b1..af22ed57e8 100644
--- a/phpBB/includes/acp/acp_attachments.php
+++ b/phpBB/includes/acp/acp_attachments.php
@@ -916,7 +916,7 @@ class acp_attachments
WHERE ' . $db->sql_in_set('attach_id', array_keys($delete_files));
$db->sql_query($sql);
- add_log('admin', 'LOG_ATTACH_ORPHAN_DEL', implode($user->lang['COMMA_SEPARATOR'], $delete_files));
+ add_log('admin', 'LOG_ATTACH_ORPHAN_DEL', implode(', ', $delete_files));
$notify[] = sprintf($user->lang['LOG_ATTACH_ORPHAN_DEL'], implode($user->lang['COMMA_SEPARATOR'], $delete_files));
}
@@ -1470,7 +1470,7 @@ class acp_attachments
// Grab the list of entries
$ips = request_var('ips', '');
$ip_list = array_unique(explode("\n", $ips));
- $ip_list_log = implode($user->lang['COMMA_SEPARATOR'], $ip_list);
+ $ip_list_log = implode(', ', $ip_list);
$ip_exclude = (int) $request->variable('ipexclude', false, false, phpbb_request_interface::POST);
diff --git a/phpBB/includes/acp/acp_bots.php b/phpBB/includes/acp/acp_bots.php
index af625e1da3..d53971ed08 100644
--- a/phpBB/includes/acp/acp_bots.php
+++ b/phpBB/includes/acp/acp_bots.php
@@ -123,7 +123,7 @@ class acp_bots
$cache->destroy('_bots');
- add_log('admin', 'LOG_BOT_DELETE', implode($user->lang['COMMA_SEPARATOR'], $bot_name_ary));
+ add_log('admin', 'LOG_BOT_DELETE', implode(', ', $bot_name_ary));
trigger_error($user->lang['BOT_DELETED'] . adm_back_link($this->u_action));
}
else
diff --git a/phpBB/includes/acp/acp_email.php b/phpBB/includes/acp/acp_email.php
index 116d74046a..c9d149b6d7 100644
--- a/phpBB/includes/acp/acp_email.php
+++ b/phpBB/includes/acp/acp_email.php
@@ -216,7 +216,7 @@ class acp_email
if ($usernames)
{
$usernames = explode("\n", $usernames);
- add_log('admin', 'LOG_MASS_EMAIL', implode($user->lang['COMMA_SEPARATOR'], utf8_normalize_nfc($usernames)));
+ add_log('admin', 'LOG_MASS_EMAIL', implode(', ', utf8_normalize_nfc($usernames)));
}
else
{
diff --git a/phpBB/includes/acp/acp_prune.php b/phpBB/includes/acp/acp_prune.php
index caa687f5ff..d867eb0297 100644
--- a/phpBB/includes/acp/acp_prune.php
+++ b/phpBB/includes/acp/acp_prune.php
@@ -273,7 +273,7 @@ class acp_prune
}
}
- add_log('admin', $l_log, implode($user->lang['COMMA_SEPARATOR'], $usernames));
+ add_log('admin', $l_log, implode(', ', $usernames));
$msg = $user->lang['USER_' . strtoupper($action) . '_SUCCESS'];
}
else