From e4defede57bcde636ee7afb59e0e9a385f7f4a13 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Mon, 12 Dec 2005 23:17:30 +0000
Subject: - 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/viewtopic.php | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

(limited to 'phpBB/language/en/viewtopic.php')

diff --git a/phpBB/language/en/viewtopic.php b/phpBB/language/en/viewtopic.php
index 3a5a21dd83..b211fc82bf 100644
--- a/phpBB/language/en/viewtopic.php
+++ b/phpBB/language/en/viewtopic.php
@@ -3,7 +3,7 @@
 *
 * viewtopic [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(
 	'ATTACHMENT'			=> 'Attachment',
 
 	'BOOKMARK_ADDED'		=> 'Bookmarked Topic successfully.',
@@ -104,6 +104,6 @@ $lang += array(
 	'VOTE_SUBMITTED'		=> 'Your vote has been cast',
 
 	'WROTE'					=> 'wrote',
-);
+));
 
 ?>
\ No newline at end of file
-- 
cgit v1.2.1