diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2005-12-12 23:17:30 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2005-12-12 23:17:30 +0000 |
| commit | e4defede57bcde636ee7afb59e0e9a385f7f4a13 (patch) | |
| tree | 0ca637e6d650147cd257f35062ea3c47c7be2326 /phpBB/language/en/acp/ban.php | |
| parent | c12fd5d434c9a3cda6bedb2d450243b278cd5dcb (diff) | |
| download | forums-e4defede57bcde636ee7afb59e0e9a385f7f4a13.tar forums-e4defede57bcde636ee7afb59e0e9a385f7f4a13.tar.gz forums-e4defede57bcde636ee7afb59e0e9a385f7f4a13.tar.bz2 forums-e4defede57bcde636ee7afb59e0e9a385f7f4a13.tar.xz forums-e4defede57bcde636ee7afb59e0e9a385f7f4a13.zip | |
- forum administration (now working and modified for easier handling the different forum types [UI])
- Changed += for arrays into array_merge. We do not want to append, we want to merge. ;)
git-svn-id: file:///svn/phpbb/trunk@5330 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/language/en/acp/ban.php')
| -rw-r--r-- | phpBB/language/en/acp/ban.php | 4 |
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 |