aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB/includes/functions_posting.php
diff options
context:
space:
mode:
authorCesar G <prototech91@gmail.com>2014-05-05 13:13:48 -0700
committerCesar G <prototech91@gmail.com>2014-05-05 13:13:48 -0700
commit74cb99f0673c5dd9a6d0a6566c72e6ad36b6ccea (patch)
tree1d11968d0e7b9d38de6cbfbb401c1022975c71ff /phpBB/includes/functions_posting.php
parent6cca7d0443a833c3e6b11c30bdfadc5f6d78c7f1 (diff)
downloadforums-74cb99f0673c5dd9a6d0a6566c72e6ad36b6ccea.tar
forums-74cb99f0673c5dd9a6d0a6566c72e6ad36b6ccea.tar.gz
forums-74cb99f0673c5dd9a6d0a6566c72e6ad36b6ccea.tar.bz2
forums-74cb99f0673c5dd9a6d0a6566c72e6ad36b6ccea.tar.xz
forums-74cb99f0673c5dd9a6d0a6566c72e6ad36b6ccea.zip
[ticket/12357] Support routes in generate_smilies() function.
PHPBB3-12357
Diffstat (limited to 'phpBB/includes/functions_posting.php')
-rw-r--r--phpBB/includes/functions_posting.php4
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&amp;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)
{