makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 06:08:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

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. ;-)

Browse source 
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10289 89ea8834-ac86-4346-8a33-228a782c2dd0
This commit is contained in:
Andreas Fischer 2009-11-24 18:47:42 +00:00
parent 02235a87cd
commit 00859fa47c
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/feed.php
View file

@ -119,7 +119,7 @@ if (!$feed_updated_time)
// Some default assignments // Some default assignments
// FEED_IMAGE is not used (atom) // 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)) : '', '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), 'SELF_LINK' => feed_append_sid('/feed.' . $phpEx, $params),
'FEED_LINK' => $board_url . '/index.' . $phpEx, '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_UPDATED' => $user->format_date($feed_updated_time, $feed_date_format, true),
'FEED_LANG' => $user->lang['USER_LANG'], 'FEED_LANG' => $user->lang['USER_LANG'],
'FEED_AUTHOR' => $config['sitename'], 'FEED_AUTHOR' => $config['sitename'],
); ));
$feed->close(); $feed->close();