- 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/viewforum.php

@@ -3,7 +3,7 @@
 *
 * viewforum [English]
 *
-* @package phpBB3
+* @package language
 * @version $Id$
 * @copyright (c) 2005 phpBB Group 
 * @license http://opensource.org/licenses/gpl-license.php GNU Public License 
@@ -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(
 	'ACTIVE_TOPICS'			=> 'Active Topics',
 	'ANNOUNCEMENTS'			=> 'Announcements',
 	
@@ -52,6 +52,6 @@ $lang += array(
 	'VIEW_FORUM'			=> 'View Forum',
 	'VIEW_FORUM_TOPIC'		=> '1 Topic',
 	'VIEW_FORUM_TOPICS'		=> '%d Topics',
-);
+));
 
 ?>