diff options
| author | Meik Sievertsen <acydburn@phpbb.com> | 2009-08-17 14:45:14 +0000 |
|---|---|---|
| committer | Meik Sievertsen <acydburn@phpbb.com> | 2009-08-17 14:45:14 +0000 |
| commit | f7009291e20969421f90ab81eed1347a4d977501 (patch) | |
| tree | f035239d9c544d3f9a97289dea6280ac950d1a01 /phpBB/includes/functions_content.php | |
| parent | fe01a43d453f81e4c6229eed2d40e2281a7dcffa (diff) | |
| download | forums-f7009291e20969421f90ab81eed1347a4d977501.tar forums-f7009291e20969421f90ab81eed1347a4d977501.tar.gz forums-f7009291e20969421f90ab81eed1347a4d977501.tar.bz2 forums-f7009291e20969421f90ab81eed1347a4d977501.tar.xz forums-f7009291e20969421f90ab81eed1347a4d977501.zip | |
Ability to define constant PHPBB_USE_BOARD_URL_PATH to use board url for images/avatars/ranks/imageset...
This feature does not change anything for those not using the constant and this feature is also quite in-flux. We need to test this with some applications and bridges and there may be other locations able to benefit from it.
git-svn-id: file:///svn/phpbb/branches/phpBB-3_0_0@10008 89ea8834-ac86-4346-8a33-228a782c2dd0
Diffstat (limited to 'phpBB/includes/functions_content.php')
| -rw-r--r-- | phpBB/includes/functions_content.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php index c4ac48e8e8..7a30f0069e 100644 --- a/phpBB/includes/functions_content.php +++ b/phpBB/includes/functions_content.php @@ -733,7 +733,8 @@ function smiley_text($text, $force_option = false) } else { - return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/(.*?) \/><!\-\- s\1 \-\->#', '<img src="' . $phpbb_root_path . $config['smilies_path'] . '/\2 />', $text); + $root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $phpbb_root_path; + return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/(.*?) \/><!\-\- s\1 \-\->#', '<img src="' . $root_path . $config['smilies_path'] . '/\2 />', $text); } } |