aboutsummaryrefslogtreecommitdiffstats
path: root/phpBB
diff options
context:
space:
mode:
authorJoas Schilling <nickvergessen@gmx.de>2013-06-03 11:57:40 +0200
committerJoas Schilling <nickvergessen@gmx.de>2013-06-03 12:37:54 +0200
commitc0e0c13cf17bac9256e3acb1ea2d67134d6122dd (patch)
tree0d6276ed09a37e89a695d4382e0f78aacfb914ec /phpBB
parent81140ec8877236050b822517f735b49503bcd44d (diff)
downloadforums-c0e0c13cf17bac9256e3acb1ea2d67134d6122dd.tar
forums-c0e0c13cf17bac9256e3acb1ea2d67134d6122dd.tar.gz
forums-c0e0c13cf17bac9256e3acb1ea2d67134d6122dd.tar.bz2
forums-c0e0c13cf17bac9256e3acb1ea2d67134d6122dd.tar.xz
forums-c0e0c13cf17bac9256e3acb1ea2d67134d6122dd.zip
[ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL parts
PHPBB3-8319
Diffstat (limited to 'phpBB')
-rw-r--r--phpBB/includes/acp/acp_bbcodes.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php
index 2cb1390c8e..02ec8af5b9 100644
--- a/phpBB/includes/acp/acp_bbcodes.php
+++ b/phpBB/includes/acp/acp_bbcodes.php
@@ -345,6 +345,9 @@ class acp_bbcodes
'LOCAL_URL' => array(
'!(' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('relative_url')) . ')!e' => "\$this->bbcode_specialchars('$1')"
),
+ 'RELATIVE_URL' => array(
+ '!(' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('relative_url')) . ')!e' => "\$this->bbcode_specialchars('$1')"
+ ),
'EMAIL' => array(
'!(' . get_preg_expression('email') . ')!ie' => "\$this->bbcode_specialchars('$1')"
),
@@ -371,6 +374,7 @@ class acp_bbcodes
$sp_tokens = array(
'URL' => '(?i)((?:' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('url')) . ')|(?:' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('www_url')) . '))(?-i)',
'LOCAL_URL' => '(?i)(' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('relative_url')) . ')(?-i)',
+ 'RELATIVE_URL' => '(?i)(' . str_replace(array('!', '\#'), array('\!', '#'), get_preg_expression('relative_url')) . ')(?-i)',
'EMAIL' => '(' . get_preg_expression('email') . ')',
'TEXT' => '(.*?)',
'SIMPLETEXT' => '([a-zA-Z0-9-+.,_ ]+)',