* develop-olympus:
[ticket/10029] Use $_SERVER['SERVER_PROTOCOL'] for determining HTTP version.
[ticket/9805] Setup security repository for developers.
[ticket/9805] Move check lower down.
[ticket/9805] Better support for already existing repositories.
[ticket/9805] Add dry-run option.
[ticket/9805] Use getopt(), add a few options, extend show_usage().
[ticket/9805] Script for easily cloning a whole github network.
* ticket/nickvergessen/9823:
[ticket/9823] Replace 0x80000000 with -2147483648 in tests.
[ticket/9823] Move mock file into the mock/ folder.
[ticket/9823] Update Unit tests to the new system and correct some minor issues
[ticket/9823] Update copyright year and add newline at the end of the file.
[ticket/9823] Correct unit-tests to use self:: instead of the class-name.
[ticket/9823] Unit tests for validate_config_vars.
[ticket/9823] Unit tests for build_cfg_template.
[ticket/9823] Unit tests for validate_rang.
[ticket/9823] Unit tests for h_radio.
[ticket/9823] Moving the functions. Unit tests for build_select.
Conflicts:
phpBB/adm/index.php
* develop-olympus:
[ticket/9985] 3D Wave CAPTCHA: Pass min/max in the correct order to mt_rand().
[ticket/9989] Skip PM popup in overall_header.html, if there are no new PMs.
The comment in the code says: "We now get the first number passed and will
select the key based upon this number". But the loop over the arguments is not
left and therefore it uses the last int-value not the first one.
PHPBB3-9949
The language pack download page includes index.html files instead of index.htm. It also does not include the new captcha_*.php files which are included since 3.0.6.
PHPBB3-9966
If acm_file cannot open the cache file for writing, it prints a message
to that effect and calls die(). The message itself does not indicate that
it is a fatal error, and someone seeing the message might expect that
inability to write to cache is not fatal.
Make it clear that the error is fatal by printing the word "Fatal" before
the message.
PHPBB3-10014
* Created new Template variable to house class names based on $folder_img value in functions_display.php.
* Created new Template variable to house class names based on $folder_img value in mcp_forums.php.
* Created new Template variable to house class names based on $folder_img value in ucp_main.php.
* Created new Template variable to house class names based on $folder_img value in search.php.
* Created new Template variable to house class names based on $folder_img value in ucp_pm_viewfolder.php.
* Created new Template variable to house class names based on $folder_img value in search.php.
* Created new Template variable to house class names based on $folder_img value in viewforum.php.
* Modified forumlist_body.html to utilize class for forum & topic images through out template via the newly created Template variable
* Modified mcp_forum.html to utilize class for forum & topic images through out template via the newly created Template variable
* Modified search_results.html to utilize class for forum & topic images through out template via the newly created Template variable
* Modified ucp_main_bookmarks.html to utilize class for forum & topic images through out template via the newly created Template variable
* Modified ucp_main_subscribed.html to utilize class for forum & topic images through out template via the newly created Template variable
* Modified ucp_main_front.html to utilize class for forum & topic images through out template via the newly created Template variable
* Modified ucp_pm_viewfolder.html to utilize class for forum & topic images through out template via the newly created Template variable
* Modified viewforum_body.html to utilize class for forum & topic images through out template via the newly created Template variable
* Created the new styles within colours.css to handle the displaying of the forum & topic images
- NOTES: This changes are the first step in the revamp of prosilver initiative, this provides the ground work to handle the images via sprites to reduce the amount of HTTP requests by the server
PHPBB3-10001
* ticket/bantu/9790:
[ticket/9790] Support for lighttpd's X-Sendfile header for attachments.
[ticket/9790] Support for nginx's X-Accel-Redirect header for attachments.
[ticket/9790] Always call file_gc(false) before sending the file.
[ticket/9790] Add $exit parameter to file_gc().
* develop-olympus:
[ticket/9859] Remove the years from the copyright statements in docs files.
[ticket/9859] Remove the year from the copyright meta tag in docs/*.html
[ticket/9859] Remove the meta copyright tag as well.
[ticket/9859] Remove the credit line comment from all html files.
[ticket/9859] Remove years in credit line from some more files.
* ticket/bantu/9859:
[ticket/9859] Remove the years from the copyright statements in docs files.
[ticket/9859] Remove the year from the copyright meta tag in docs/*.html
[ticket/9859] Remove the meta copyright tag as well.
[ticket/9859] Remove the credit line comment from all html files.
[ticket/9859] Remove years in credit line from some more files.
Rename $unicode to $unicode_support, pass in $use_unicode defaulting to true.
In unit tests we can now pass in $use_unicode as false and also test the code
path that is taken when PCRE does not support unicode.
PHPBB3-9933
* task/naderman/config-class:
[task/config-class] Do not create multiple cache driver instances.
[task/config-class] Add an attribute for the table name in phpbb_config_db.
[task/config-class] Correctly merge cached config with dynamically loaded data.
[task/config-class] Always specify the config table to use.
[task/config-class] Fix db config constructor param order
[task/config-class] Implemented a config class to replace the global array.
