diff options
| author | Nils Adermann <naderman@naderman.de> | 2011-09-20 21:26:37 +0200 |
|---|---|---|
| committer | Nils Adermann <naderman@naderman.de> | 2011-09-20 21:26:37 +0200 |
| commit | 4e8e31c10b11972a073a79fbbd7865a1195ef456 (patch) | |
| tree | ca0578de1e67d065004f770d3881b37482c8bae9 /phpBB/feed.php | |
| parent | f31d32dd89e5d01e08f0ae09b43042377bfdfc0c (diff) | |
| parent | 3e76f7468864f5e5d8c3f805745c44e422ae817c (diff) | |
| download | forums-4e8e31c10b11972a073a79fbbd7865a1195ef456.tar forums-4e8e31c10b11972a073a79fbbd7865a1195ef456.tar.gz forums-4e8e31c10b11972a073a79fbbd7865a1195ef456.tar.bz2 forums-4e8e31c10b11972a073a79fbbd7865a1195ef456.tar.xz forums-4e8e31c10b11972a073a79fbbd7865a1195ef456.zip | |
Merge remote-tracking branch 'github-cyberalien/feature/remove-imagesets' into develop
* github-cyberalien/feature/remove-imagesets:
[feature/remove-imagesets] Script for converting imageset to css
[feature/remove-imagesets] Changing subsilver
[feature/remove-imagesets] Changing prosilver
[feature/remove-imagesets] Adjustments to php files
[feature/remove-imagesets] Changing admin control panel styles module
[feature/remove-imagesets] Changing database structure
[feature/remove-imagesets] Removing imageset files
[feature/remove-imagesets] Moving images
Diffstat (limited to 'phpBB/feed.php')
| -rw-r--r-- | phpBB/feed.php | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/phpBB/feed.php b/phpBB/feed.php index bc23a19f42..b8c0c370f9 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -127,7 +127,7 @@ if (!$feed_updated_time) // Some default assignments // FEED_IMAGE is not used (atom) $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' => '', 'SELF_LINK' => feed_append_sid('/feed.' . $phpEx, $params), 'FEED_LINK' => $board_url . '/index.' . $phpEx, 'FEED_TITLE' => $config['sitename'], |