diff options
| author | Joas Schilling <nickvergessen@gmx.de> | 2013-07-10 17:24:49 +0200 |
|---|---|---|
| committer | Joas Schilling <nickvergessen@gmx.de> | 2013-07-10 17:24:49 +0200 |
| commit | 34ad665c8bad380c91d1f4c333f2fe482a263fec (patch) | |
| tree | 8d98a6eb7ed3f9744b629b2351b56c80462e48d2 /phpBB/language/en/acp/posting.php | |
| parent | 2d7a91ebd630d6b9316f05cd8c153cd9dde5c3c9 (diff) | |
| parent | 9210d735a53e3c4a4de042b49dae361c436268e1 (diff) | |
| download | forums-34ad665c8bad380c91d1f4c333f2fe482a263fec.tar forums-34ad665c8bad380c91d1f4c333f2fe482a263fec.tar.gz forums-34ad665c8bad380c91d1f4c333f2fe482a263fec.tar.bz2 forums-34ad665c8bad380c91d1f4c333f2fe482a263fec.tar.xz forums-34ad665c8bad380c91d1f4c333f2fe482a263fec.zip | |
Merge branch 'ticket/8319' into ticket/8319-develop2
* 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
Conflicts:
phpBB/install/database_update.php
Diffstat (limited to 'phpBB/language/en/acp/posting.php')
| -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 89e171744f..ea3eadb0dd 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 email 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>' ) )); |