diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-06-03 12:35:57 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-06-03 12:37:58 +0200 |
| commit | 6206d4aa4ea08df513154d8b87d35785f69a9f2a (patch) | |
| tree | d191e5132e26f2aa8aadbbd4653d63c7a987808a /phpBB | |
| parent | 24bfaa13270bbdeca1e00c95b025b3fd42742633 (diff) | |
| download | forums-6206d4aa4ea08df513154d8b87d35785f69a9f2a.tar forums-6206d4aa4ea08df513154d8b87d35785f69a9f2a.tar.gz forums-6206d4aa4ea08df513154d8b87d35785f69a9f2a.tar.bz2 forums-6206d4aa4ea08df513154d8b87d35785f69a9f2a.tar.xz forums-6206d4aa4ea08df513154d8b87d35785f69a9f2a.zip | |
[ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL
The explanation now states that links are prefixed with the board URL.
PHPBB3-8319
Diffstat (limited to 'phpBB')
| -rw-r--r-- | phpBB/includes/acp/acp_bbcodes.php | 4 | ||||
| -rw-r--r-- | phpBB/language/en/acp/posting.php | 3 |
2 files changed, 4 insertions, 3 deletions
diff --git a/phpBB/includes/acp/acp_bbcodes.php b/phpBB/includes/acp/acp_bbcodes.php index 02ec8af5b9..ead716b300 100644 --- a/phpBB/includes/acp/acp_bbcodes.php +++ b/phpBB/includes/acp/acp_bbcodes.php @@ -113,8 +113,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; diff --git a/phpBB/language/en/acp/posting.php b/phpBB/language/en/acp/posting.php index 9719287c2a..9232be661b 100644 --- a/phpBB/language/en/acp/posting.php +++ b/phpBB/language/en/acp/posting.php @@ -83,7 +83,8 @@ $lang = array_merge($lang, array( 'NUMBER' => 'Any series of digits', 'EMAIL' => 'A valid e-mail address', 'URL' => 'A valid URL using any protocol (http, ftp, etc… cannot be used for javascript exploits). If none is given, “http://” is prefixed to the string.', - 'LOCAL_URL' => 'A local URL. The URL must be relative to the topic page and cannot contain a server name or protocol.', + 'LOCAL_URL' => 'A local URL. The URL must be relative to the topic page and cannot contain a server name or protocol, as links are prefixed with “%s”', + 'RELATIVE_URL' => 'A relative URL. You can use this to match parts of a URL, but be careful: a full URL is a valid relative URL. When you want to use relative URLs of your board, use the LOCAL_URL token.', 'COLOR' => 'A HTML colour, can be either in the numeric form <samp>#FF1234</samp> or a <a href="http://www.w3.org/TR/CSS21/syndata.html#value-def-color">CSS colour keyword</a> such as <samp>fuchsia</samp> or <samp>InactiveBorder</samp>' ) )); |