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_posting.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_posting.php')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 4cf6b7010d..069740ebda 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -112,12 +112,14 @@ function generate_smilies($mode, $forum_id) if (sizeof($smilies)) { + $root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $phpbb_root_path; + foreach ($smilies as $row) { $template->assign_block_vars('smiley', array( 'SMILEY_CODE' => $row['code'], 'A_SMILEY_CODE' => addslashes($row['code']), - 'SMILEY_IMG' => $phpbb_root_path . $config['smilies_path'] . '/' . $row['smiley_url'], + 'SMILEY_IMG' => $root_path . $config['smilies_path'] . '/' . $row['smiley_url'], 'SMILEY_WIDTH' => $row['smiley_width'], 'SMILEY_HEIGHT' => $row['smiley_height'], 'SMILEY_DESC' => $row['emotion']) |