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/includes/functions_profile_fields.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/includes/functions_profile_fields.php')
0 files changed, 0 insertions, 0 deletions