aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/language/en/acp/modules.php
diff options
context:
space:
mode:
authorMeik Sievertsen <acydburn@phpbb.com>2005-12-12 23:17:30 +0000
committerMeik Sievertsen <acydburn@phpbb.com>2005-12-12 23:17:30 +0000
commite4defede57bcde636ee7afb59e0e9a385f7f4a13 (patch)
tree0ca637e6d650147cd257f35062ea3c47c7be2326 /phpBB/language/en/acp/modules.php
parentc12fd5d434c9a3cda6bedb2d450243b278cd5dcb (diff)
downloadforums-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/modules.php')
-rw-r--r--phpBB/language/en/acp/modules.php4
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/language/en/acp/modules.php b/phpBB/language/en/acp/modules.php
index c36dc4ad1d..6ece0a62d6 100644
--- a/phpBB/language/en/acp/modules.php
+++ b/phpBB/language/en/acp/modules.php
@@ -28,7 +28,7 @@ if (empty($lang) || !is_array($lang))
// equally where a string contains only two placeholders which are used to wrap text
// in a url you again do not need to specify an order e.g., 'Click %sHERE%s' is fine
-$lang += array(
+$lang = array_merge($lang, array(
'ACP_MODULE_MANAGEMENT_EXPLAIN' => 'Here you are able to manage all kind of modules. Please note that if you place the same module under different categories, the category selected will be the first one found within the tree.',
'ADD_MODULE' => 'Add module',
'ADD_MODULE_CONFIRM' => 'Are you sure you want to add the selected module with the selected mode?',
@@ -70,6 +70,6 @@ $lang += array(
'PARENT_NO_EXIST' => 'Parent does not exist',
'SELECT_MODULE' => 'Select a module',
-);
+));
?> \ No newline at end of file