diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2009-11-24 18:47:42 +0000 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2009-11-24 18:47:42 +0000 |
| commit | 00859fa47c770baee81210d4bcedfe91b889efac (patch) | |
| tree | 7823f74b12e519bdad4f0b0146a0965530e60629 /phpBB/feed.php | |
| parent | 02235a87cdd1f77cc651784fd1d3846fda4183d7 (diff) | |
| download | forums-00859fa47c770baee81210d4bcedfe91b889efac.tar forums-00859fa47c770baee81210d4bcedfe91b889efac.tar.gz forums-00859fa47c770baee81210d4bcedfe91b889efac.tar.bz2 forums-00859fa47c770baee81210d4bcedfe91b889efac.tar.xz forums-00859fa47c770baee81210d4bcedfe91b889efac.zip | |
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
Diffstat (limited to 'phpBB/feed.php')
| -rw-r--r-- | phpBB/feed.php | 4 |
1 files 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(); |