diff options
| author | Andreas Fischer <bantu@phpbb.com> | 2010-07-22 01:39:18 +0200 |
|---|---|---|
| committer | Andreas Fischer <bantu@phpbb.com> | 2010-07-22 01:39:18 +0200 |
| commit | cfe0b5356f1809943b65c1976c4470a100deb0ef (patch) | |
| tree | 37a0c856c247da734239e077bcbf9e865077610a | |
| parent | 0dc05a2d8431ce01434dbe27b6708eefc59f2f68 (diff) | |
| parent | 16c95b4f8394e65faa34380640c892b1f99be1ed (diff) | |
| download | forums-cfe0b5356f1809943b65c1976c4470a100deb0ef.tar forums-cfe0b5356f1809943b65c1976c4470a100deb0ef.tar.gz forums-cfe0b5356f1809943b65c1976c4470a100deb0ef.tar.bz2 forums-cfe0b5356f1809943b65c1976c4470a100deb0ef.tar.xz forums-cfe0b5356f1809943b65c1976c4470a100deb0ef.zip | |
Merge branch 'ticket/jellydoughnut/9727' into develop-olympus
* ticket/jellydoughnut/9727:
[ticket/9727] Smiley Path replacement in feeds is too generic
| -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 88c30c5d4f..c4b71f3a26 100644 --- a/phpBB/feed.php +++ b/phpBB/feed.php @@ -276,8 +276,8 @@ function feed_generate_content($content, $uid, $bitfield, $options) // Add newlines $content = str_replace('<br />', '<br />' . "\n", $content); - // Relative Path to Absolute path, Windows style - $content = str_replace('./', $board_url . '/', $content); + // Convert smiley Relative paths to Absolute path, Windows style + $content = str_replace($phpbb_root_path . $config['smilies_path'], $board_url . '/' . $config['smilies_path'], $content); // Remove "Select all" link and mouse events $content = str_replace('<a href="#" onclick="selectCode(this); return false;">' . $user->lang['SELECT_ALL_CODE'] . '</a>', '', $content); |