From 00859fa47c770baee81210d4bcedfe91b889efac Mon Sep 17 00:00:00 2001
From: Andreas Fischer <bantu@phpbb.com>
Date: Tue, 24 Nov 2009 18:47:42 +0000
Subject: [PATCH] We've got to use array_merge() as long as we want to be able
 to write to $global_vars. r10281 didn't change this, btw. ;-)

git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10289 89ea8834-ac86-4346-8a33-228a782c2dd0
---
 phpBB/feed.php | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/feed.php b/phpBB/feed.php
index 767922676f..425545a0dd 100644
--- a/phpBB/feed.php
+++ b/phpBB/feed.php
@@ -119,7 +119,7 @@ if (!$feed_updated_time)
 
 // Some default assignments
 // FEED_IMAGE is not used (atom)
-$global_vars = array(
+$global_vars = array_merge($global_vars, array(
 	'FEED_IMAGE'			=> ($user->img('site_logo', '', false, '', 'src')) ? $board_url . '/' . substr($user->img('site_logo', '', false, '', 'src'), strlen($phpbb_root_path)) : '',
 	'SELF_LINK'				=> feed_append_sid('/feed.' . $phpEx, $params),
 	'FEED_LINK'				=> $board_url . '/index.' . $phpEx,
@@ -128,7 +128,7 @@ $global_vars = array(
 	'FEED_UPDATED'			=> $user->format_date($feed_updated_time, $feed_date_format, true),
 	'FEED_LANG'				=> $user->lang['USER_LANG'],
 	'FEED_AUTHOR'			=> $config['sitename'],
-);
+));
 
 $feed->close();