mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-08-05 16:27:38 +02:00
Code Issues Releases Wiki Activity

Merge branch '3.3.x'

Browse Source
This commit is contained in:
Marc Alexander
2023-08-06 14:56:53 +02:00
parent cdc7f6da22 e5db724d2c
commit abc4867dbd
6 changed files with 14 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
phpBB/includes/functions_posting.php
View File

@@ -189,7 +189,7 @@ function generate_smilies($mode, $forum_id)
if (count($smilies))
{
$root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $phpbb_path_helper->get_web_root_path();
$root_path = $phpbb_path_helper->get_web_root_path();
foreach ($smilies as $row)
{
@@ -421,7 +421,7 @@ function update_post_information($type, $ids, $return_update_sql = false)
*/
function posting_gen_topic_icons($mode, $icon_id)
{
global $phpbb_root_path, $config, $template, $cache;
global $phpbb_root_path, $phpbb_path_helper, $config, $template, $cache;
// Grab icons
$icons = $cache->obtain_icons();
@@ -433,7 +433,7 @@ function posting_gen_topic_icons($mode, $icon_id)
if (count($icons))
{
$root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $phpbb_root_path;
$root_path = $phpbb_path_helper->get_web_root_path();
foreach ($icons as $id => $data)
{