aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/feed.php
diff options
context:
space:
mode:
authorJosh Woody <a_jelly_doughnut@phpbb.com>2010-07-18 11:51:13 -0500
committerJosh Woody <a_jelly_doughnut@phpbb.com>2010-07-18 11:51:13 -0500
commit16c95b4f8394e65faa34380640c892b1f99be1ed (patch)
tree1eb51c9fc0eab512a8936a2f6227cd4afbcb3689 /phpBB/feed.php
parentb7ae0fe4e91be1f7dc1d38d2c3c1e5b043d95739 (diff)
downloadforums-16c95b4f8394e65faa34380640c892b1f99be1ed.tar
forums-16c95b4f8394e65faa34380640c892b1f99be1ed.tar.gz
forums-16c95b4f8394e65faa34380640c892b1f99be1ed.tar.bz2
forums-16c95b4f8394e65faa34380640c892b1f99be1ed.tar.xz
forums-16c95b4f8394e65faa34380640c892b1f99be1ed.zip
[ticket/9727] Smiley Path replacement in feeds is too generic
The smiley path replacement in the feeds was too broad: any post content containing "./" was changed to the fully qualified board URL. This broke CSS for example. PHPBB3-9727
Diffstat (limited to 'phpBB/feed.php')
-rw-r--r--phpBB/feed.php4
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);