diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2014-05-07 21:08:10 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2014-05-07 21:08:10 +0200 |
| commit | 7294bc9402ec5ede12788825adcb738147814512 (patch) | |
| tree | a3aac2723fa9e918bdfb5fc4023f7303f4831de4 /phpBB/includes | |
| parent | 3c86a9bcca0301176d35ded3f4a8bf8c485f027f (diff) | |
| parent | 74cb99f0673c5dd9a6d0a6566c72e6ad36b6ccea (diff) | |
| download | forums-7294bc9402ec5ede12788825adcb738147814512.tar forums-7294bc9402ec5ede12788825adcb738147814512.tar.gz forums-7294bc9402ec5ede12788825adcb738147814512.tar.bz2 forums-7294bc9402ec5ede12788825adcb738147814512.tar.xz forums-7294bc9402ec5ede12788825adcb738147814512.zip | |
Merge pull request #2413 from prototech/ticket/12357
[ticket/12357] Support routes in generate_smilies() function.
* prototech/ticket/12357:
[ticket/12357] Support routes in generate_smilies() function.
Diffstat (limited to 'phpBB/includes')
| -rw-r--r-- | phpBB/includes/functions_posting.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/phpBB/includes/functions_posting.php b/phpBB/includes/functions_posting.php index 547ea69e81..cc46799252 100644 --- a/phpBB/includes/functions_posting.php +++ b/phpBB/includes/functions_posting.php @@ -21,7 +21,7 @@ if (!defined('IN_PHPBB')) function generate_smilies($mode, $forum_id) { global $db, $user, $config, $template, $phpbb_dispatcher; - global $phpEx, $phpbb_root_path, $phpbb_container; + global $phpEx, $phpbb_root_path, $phpbb_container, $phpbb_path_helper; $base_url = append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=smilies&f=' . $forum_id); $pagination = $phpbb_container->get('pagination'); @@ -111,7 +111,7 @@ 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; + $root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $phpbb_path_helper->get_web_root_path(); foreach ($smilies as $row) { |