diff options
| author | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-11 10:09:53 -0500 |
|---|---|---|
| committer | Nathaniel Guse <nathaniel.guse@gmail.com> | 2013-07-11 10:09:53 -0500 |
| commit | ece01f0a1f31ac45761043dbc3515374a4a81dc8 (patch) | |
| tree | 95d7d7a56bf19b904b88db69b017f4e2b13ff7b5 /phpBB/language | |
| parent | 13c087d4f10944ea646fc9fa1ba10a8dc368ceb3 (diff) | |
| parent | 9210d735a53e3c4a4de042b49dae361c436268e1 (diff) | |
| download | forums-ece01f0a1f31ac45761043dbc3515374a4a81dc8.tar forums-ece01f0a1f31ac45761043dbc3515374a4a81dc8.tar.gz forums-ece01f0a1f31ac45761043dbc3515374a4a81dc8.tar.bz2 forums-ece01f0a1f31ac45761043dbc3515374a4a81dc8.tar.xz forums-ece01f0a1f31ac45761043dbc3515374a4a81dc8.zip | |
Merge remote-tracking branch 'remotes/nickv/ticket/8319' into develop-olympus
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/8319:
[ticket/8319] Do not repeat the replacement
[ticket/8319] Add explanation for RELATIVE_URL and update LOCAL_URL
[ticket/8319] Update BBCodes that currently use the LOCAL_URL tag on update
[ticket/8319] Add new token RELATIVE_URL to allow foreign relative URL parts
[ticket/8319] Prepend Board URL to LOCAL_URL links to prevent abuse
Diffstat (limited to 'phpBB/language')
| -rw-r--r-- | phpBB/language/en/acp/posting.php | 3 |
1 files changed, 2 insertions, 1 deletions
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>' ) )); |