# By Andreas Fischer
# Via Andreas Fischer (1) and Nathaniel Guse (1)
* develop-olympus:
[ticket/11662] Typos: occured -> occurred
Conflicts:
tests/template/template_test.php
* develop-olympus:
[ticket/11548] Use new static methods for request and submit
[ticket/11548] Run array_map on complete error array and not just colour_error
Conflicts:
tests/functional/ucp_groups_test.php
* marc1706/ticket/11548:
[ticket/11548] Use new static methods for request and submit
[ticket/11548] Run array_map on complete error array and not just colour_error
Up to now the array_map() that turns error messages into the localized output
was only ran if the group's color was set. With this patch it'll run the
array_map() on the complete error array if it's not empty.
PHPBB3-11548
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/develop/10772:
[ticket/develop/10772] Fix copyright year
[ticket/develop/10772] Unit tests for forum specific style
[ticket/10772] Use forum specific style for trigger_error
# By Vjacheslav Trushkin
# Via Vjacheslav Trushkin
* remotes/cyberalien/ticket/10772:
[ticket/10772] Remove unnecessary comment
[ticket/10772] Functional tests for forum style
[ticket/10772] Use forum specific style for trigger_error
# By Joas Schilling
# Via Joas Schilling
* remotes/nickv/ticket/8319-develop:
[ticket/8319] Add migration file for update change
[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
# 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
Changed expected output to file?(any supplied argument string)&asset_version
=($config['asset_version'])#(any supplied anchor string)
Testing lines one at a time to make checking them easier.
PHPBB3-11388
Copied from the INCLUDECSS PR, since this needed to be modified.
Added checks for argument strings/anchors/http/https paths in asset files
to load files properly
PHPBB3-11388
* 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
If debug mode is enabled, lets check for new/removed EVENT templates on
page load rather than at compile. This is slower, but makes developing
extensions easier (no need to purge the cache when a new event template
file is added)
PHPBB3-11598
The PHP lint pre-commit hook fails to display any output when an error
other than a parse error is decteced.
Additionally, the hook may not display any meaningful output depending
on php.ini settings. This commit removes the dependency on php.ini.
PHPBB3-11630
# By David King
# Via David King
* remotes/imkingdavid/ticket/11253:
[ticket/11253] Put AND clause in correct SQL query
[ticket/11253] Fix a few things brought up in the PR
[ticket/11253] Fix typo in constant
[ticket/11253] Add migration to add auth check to UCP signature module
# By Andreas Fischer
# Via Andreas Fischer (1) and Nathan Guse (1)
* develop-olympus:
[ticket/11619] Use HTTP/1.0 because of lack of chunked-encoding handling.
[ticket/11619] Some tests for get_remote_file().
