* paybas/ticket/12339:
[ticket/12339] removed return var
[ticket/12339] more complete params and updated _since version
[ticket/12339] Add Event core.page_header_after
* crizz0/ticket/9758:
[ticket/9758] Clickable avatar in header and renamed class for avatar-img
[ticket/9758] Remove unnessary if-question for include functions_display
[ticket/9758] Slims the line 4775 in includes/functions.php
[ticket/9758] Adds id and changes filter to fix travis CI test
[ticket/9758] Removed the needless space after first ENDIF
[ticket/9758] Adding impr. for overall_header display of avatar and username
[ticket/9758] Fixed bug in mcp_warn.php
[ticket/9758] Optimises the html code of avatar image in header
[ticket/9758] Error because of missing functions_display.php fixed
[ticket/9758] Removed useless if-conditions to include functions.php
[ticket/9758] Changes class name of new "span" in overall_header.html
[ticket/9758] Adds global template variable CURRENT_USER_AVATAR
* develop-olympus:
[ticket/12202] Use an array in the data provider instead of exploding manually
[ticket/12202] Can't call htmlspecialchars before checking for quotes
[ticket/12202] Fix tests
[ticket/12202] Test for parse_cfg_file
[ticket/12202] Use copyright symbol in style.cfg files
[ticket/12202] Apply htmlspecialchars to style.cfg data
Conflicts:
phpBB/styles/prosilver/style.cfg
phpBB/styles/subsilver2/style.cfg
The deprecated passwords functions are no longer used in the core and have
been replaced with the passwords manager. Therefore, the functions are
moved to the functions_compatibility file.
PHPBB3-12239
* Marc/ticket/11997: (23 commits)
[ticket/11997] Use functional test cases that should always work
[ticket/11997] Fix redirect tests for mod rewrite
[ticket/11997] Add user's page dir to redirect path and fix unit tests for it
[ticket/11997] Remove obsolete function get_controller_redirect_url()
[ticket/11997] Use path_helper in in foo/bar extension for redirect URLs
[ticket/11997] Add remove_web_root_path() in order to prevent incorrect URLs
[ticket/11997] Do not check if file or dir we redirect to exist
[ticket/11997] Modifiy tests after adding path_helper clean_url method
[ticket/11997] Add clean_url() method to path_helper
[ticket/11997] Allow redirects to parent folders like previously
[ticket/11997] Move expected redirect returns to controller and output to HTML
[ticket/11997] Fix tests for path_helper's get_controller_redirect_url()
[ticket/11997] Use get_controller_redirect_url() in redirect() function
[ticket/11997] Add method for controller redirect URLs to path helper
[ticket/11997] Undo changes to phpbb_own_realpath()
[ticket/11997] Remove obsolete failover_flag in function redirect()
[ticket/11997] Add functional test for redirects in controller
[ticket/11997] Fix missing global
[ticket/11997] Fix redirects from inside controllers
[ticket/11997] Use $phpbb_filesystem->clean_path() for proper redirect paths
...
The user's page directory needs to be added to the redirect URL for proper
redirects outside of the forum root. Fix the unit tests accordingly.
PHPBB3-11997
The redirect function will now properly redirect to where we want it to.
It will no longer try to check if the file or directory we redirect to exist.
This will ensure compatibility with the new routes.
PHPBB3-11997
The redirect url currently uses the web root path. However as we prepend the
full board url later, we need to remove the relative web root path and prepend
the normal root path again. Otherwise redirects from inside routes will not
work as intended.
PHPBB3-11997
This variable name better fits what is done with it. A comment explaining
why 2 has to be subtracted from the size of root_dirs has also been added
PHPBB3-11997
We currently do a lot of checks in order to prevent users from getting to
a 404 page. However, this logic relies on checking if a file or folder exists.
Due to the front controllers and the URL rewriting in 3.1, it is no longer
possible to rely on existing files for redirecting. This patch will take
care of properly redirecting users to front controller files. An incorrect
link will cause users to get a 404 error though.
PHPBB3-11997
# By Joas Schilling
# Via Joas Schilling
* nickvergessen/ticket/11974:
[ticket/11974] Fix timezone names with underscores
[ticket/11974] Translate all timezones
