diff options
| author | David King <imkingdavid@gmail.com> | 2013-07-11 20:43:41 -0400 |
|---|---|---|
| committer | David King <imkingdavid@gmail.com> | 2013-07-11 20:43:41 -0400 |
| commit | 8b7aef6f938bf7c08d41908e78b6e71117adba38 (patch) | |
| tree | d39d9f3720e4afe78d23772e15830a2b12f1f5ba /phpBB/includes/acp | |
| parent | b9c290b5480a958eabeef66d5e9af799f77e4566 (diff) | |
| parent | b1d3c1bf6990c8105c18eb9db06ebf9c974b0899 (diff) | |
| download | forums-8b7aef6f938bf7c08d41908e78b6e71117adba38.tar forums-8b7aef6f938bf7c08d41908e78b6e71117adba38.tar.gz forums-8b7aef6f938bf7c08d41908e78b6e71117adba38.tar.bz2 forums-8b7aef6f938bf7c08d41908e78b6e71117adba38.tar.xz forums-8b7aef6f938bf7c08d41908e78b6e71117adba38.zip | |
Merge branch 'develop' into ticket/11215
* develop: (176 commits)
[feature/bootstrap-dic] Bootstrap container from config.php
[ticket/11548] Use new static methods for request and submit
[ticket/10772] Updating tests
[ticket/10772] Remove 3.1 code
[ticket/11388] Add newlines at EOF
[ticket/11388] INCLUDECSS
[ticket/11548] Run array_map on complete error array and not just colour_error
[ticket/11644] Skip phpbb_dbal_order_lower_test on MySQL 5.6
[ticket/11388] Do not append assets_version if using remote path (e.g. http)
[ticket/11388] Fix typo
[ticket/11388] Remove typehints (causing tests to fail)
[ticket/11388] Disable cache if IN_INSTALL defined
[ticket/11388] Do not modify by reference
[ticket/11388] typehits
[ticket/11388] INCLUDEJS test for //(url)
[ticket/11388] INCLUDEJS supports //(url)
[ticket/11388] Fixing includejs test
[ticket/11388] includejs inherit from includeasset
[feature/twig] Unit tests for includejs
[ticket/8319] Add migration file for update change
...
Diffstat (limited to 'phpBB/includes/acp')
| -rw-r--r-- | phpBB/includes/acp/acp_bbcodes.php | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index e537d7a8b9..9c430b5a0b 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -112,8 +112,8 @@ class acp_bbcodes { $template->assign_block_vars('token', array( 'TOKEN' => '{' . $token . '}', - 'EXPLAIN' => $token_explain) - ); + 'EXPLAIN' => ($token === 'LOCAL_URL') ? sprintf($token_explain, generate_board_url() . '/') : $token_explain, + )); } return; @@ -347,6 +347,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')" ), @@ -373,6 +376,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-+.,_ ]+)', @@ -429,7 +433,11 @@ class acp_bbcodes $fp_replace = str_replace($token, $replace, $fp_replace); $sp_match = str_replace(preg_quote($token, '!'), $sp_tokens[$token_type], $sp_match); - $sp_replace = str_replace($token, '${' . ($n + 1) . '}', $sp_replace); + + // Prepend the board url to local relative links + $replace_prepend = ($token_type === 'LOCAL_URL') ? generate_board_url() . '/' : ''; + + $sp_replace = str_replace($token, $replace_prepend . '${' . ($n + 1) . '}', $sp_replace); } $fp_match = '!' . $fp_match . '!' . $modifiers; |