- 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

phpBB/language/en/acp/language.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_FILES'						=> 'Admin Language Files',
 	'ACP_LANGUAGE_PACKS_EXPLAIN'	=> 'Here you are able to install/remove language packs',
 
@@ -81,6 +81,6 @@ $lang += array(
 	'UNINSTALLED_LANGUAGE_PACKS'	=> 'Uninstalled language packs',
 
 	'WRONG_LANGUAGE_FILE'		=> 'Selected language file is invalid',
-);
+));
 
 ?>