From f7009291e20969421f90ab81eed1347a4d977501 Mon Sep 17 00:00:00 2001
From: Meik Sievertsen <acydburn@phpbb.com>
Date: Mon, 17 Aug 2009 14:45:14 +0000
Subject: 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
---
 phpBB/includes/functions_content.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

(limited to 'phpBB/includes/functions_content.php')

diff --git a/phpBB/includes/functions_content.php b/phpBB/includes/functions_content.php
index c4ac48e8e8..7a30f0069e 100644
--- a/phpBB/includes/functions_content.php
+++ b/phpBB/includes/functions_content.php
@@ -733,7 +733,8 @@ function smiley_text($text, $force_option = false)
 	}
 	else
 	{
-		return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/(.*?) \/><!\-\- s\1 \-\->#', '<img src="' . $phpbb_root_path . $config['smilies_path'] . '/\2 />', $text);
+		$root_path = (defined('PHPBB_USE_BOARD_URL_PATH') && PHPBB_USE_BOARD_URL_PATH) ? generate_board_url() . '/' : $phpbb_root_path;
+		return preg_replace('#<!\-\- s(.*?) \-\-><img src="\{SMILIES_PATH\}\/(.*?) \/><!\-\- s\1 \-\->#', '<img src="' . $root_path . $config['smilies_path'] . '/\2 />', $text);
 	}
 }
 
-- 
cgit v1.2.1