aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp/ban.php
diff options
context:
space:
mode:
Diffstat (limited to 'phpBB/language/en/acp/ban.php')
-rw-r--r--phpBB/language/en/acp/ban.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/ban.php b/phpBB/language/en/acp/ban.php
index 63cd0b6d41..0e7a4cd3e1 100644
--- a/phpBB/language/en/acp/ban.php
+++ b/phpBB/language/en/acp/ban.php
@@ -29,7 +29,7 @@ if (empty($lang) || !is_array($lang))
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
// Banning
-$lang += array(
+$lang = array_merge($lang, array(
'1_HOUR' => '1 Hour',
'30_MINS' => '30 Minutes',
'6_HOURS' => '6 Hours',
@@ -65,6 +65,6 @@ $lang += array(
'USER_NO_BANNED' => 'No banned usernames',
'USER_UNBAN' => 'Un-ban or Un-exclude usernames',
'USER_UNBAN_EXPLAIN' => 'You can unban (or un-exclude) multiple users in one go using the appropriate combination of mouse and keyboard for your computer and browser. Excluded users have a grey background.',
-);
+));
?> \ No newline at end of file