makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-28 22:28:51 +00:00
Code Issues Projects Releases Packages Wiki Activity

Merge branch 'develop-ascraeus' into develop

Browse source 
* develop-ascraeus:
  [ticket/12357] Support routes in generate_smilies() function.
This commit is contained in:
Joas Schilling 2014-05-07 21:14:31 +02:00
commit 3a0bb88866
1 changed files with 2 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/includes/functions_posting.php
View file

@ -21,7 +21,7 @@ if (!defined('IN_PHPBB'))
function generate_smilies($mode, $forum_id) function generate_smilies($mode, $forum_id)
{ {
global $db, $user, $config, $template, $phpbb_dispatcher; 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); $base_url = append_sid("{$phpbb_root_path}posting.$phpEx", 'mode=smilies&f=' . $forum_id);
$pagination = $phpbb_container->get('pagination'); $pagination = $phpbb_container->get('pagination');
@ -111,7 +111,7 @@ function generate_smilies($mode, $forum_id)
if (sizeof($smilies)) 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) foreach ($smilies as $row)
{ {