* develop-olympus:
[ticket/9095] Update CAPTCHA related strings to reflect CAPTCHAs plugins.
[ticket/9879] Fix markup and use Q&A instead of Q & A for consistency.
[ticket/9879] Spelling, punctuation and grammar update for the Q&A CAPTCHA.
* github-bantu/ticket/9879:
[ticket/9879] Fix markup and use Q&A instead of Q & A for consistency.
[ticket/9879] Spelling, punctuation and grammar update for the Q&A CAPTCHA.
* github-cs278/ticket/9095:
[ticket/9095] Update CAPTCHA related strings to reflect CAPTCHAs plugins.
The build_diff script generates MOD format change descriptions for
language and style files. It is automatically triggered by phin with
the correct version numbers now so it does not need to be changed
anymore.
PHPBB3-9849
Fixed spelling, punctuation and grammar as well as removed registration
specific language from plugin as it can be/is used for form submissions other
than registration.
PHPBB3-9879
* develop-olympus:
[ticket/9827] No longer emulate Internet Explorer 7 when using IE9.
[ticket/9850] Display upgrade instructions for feature release in acp
[ticket/9835] subsilver2: Don't show "To prevent automated ..." when logging in
The IE9 beta fixes the IE8 textarea width bug which required IE7 emulation in
phpBB's styles. Emulation should only occur when using IE8 now.
PHPBB3-9827
* develop-olympus:
[task/mssql-db-tests] Remove MS SQL helper values from SELECT LIMIT results.
[task/mssql-db-tests] Split up database tests into SELECT and write operations
[task/mssql-db-tests] PHPUnit output got stuck after unterminated ob_start.
[task/mssql-db-tests] sql_query_limit must return all results when total = 0
[task/mssql-db-tests] Add support for odbc & sqlsrv PDO test connections
[task/mssql-db-tests] Refactored getConnection into multiple smaller parts.
[task/mssql-db-tests] Allow test configuration with environment variables.
[task/mssql-db-tests] No longer display an error when skipping db tests.
[task/mssql-db-tests] Use a simple getter for test case helpers.
Conflicts:
tests/template/template.php
* task/naderman/mssql-db-tests:
[task/mssql-db-tests] Remove MS SQL helper values from SELECT LIMIT results.
[task/mssql-db-tests] Split up database tests into SELECT and write operations
[task/mssql-db-tests] PHPUnit output got stuck after unterminated ob_start.
[task/mssql-db-tests] sql_query_limit must return all results when total = 0
[task/mssql-db-tests] Add support for odbc & sqlsrv PDO test connections
[task/mssql-db-tests] Refactored getConnection into multiple smaller parts.
[task/mssql-db-tests] Allow test configuration with environment variables.
[task/mssql-db-tests] No longer display an error when skipping db tests.
[task/mssql-db-tests] Use a simple getter for test case helpers.
When an administrator set a numbers field to default to 'not specified', a SQL
error was caused on the registration page because it was tried to insert an
empty string into an integer column.
Because the column already supports NULL values, empty strings are now
converted to NULL for custom profile fields of the type 'Numbers' before
insertion into the data table.
PHPBB3-9075
Changed queue locking to cover all queue file operations,
in particular the check for queue file existince and
inclusion of queue file must be done under one lock.
Also refactored queue locking and unlocking into separate
methods.
PHPBB3-9061
* ticket/bantu/9627:
[ticket/9627] Prefix function names with 'phpbb_'.
[ticket/9627] Adding unit tests for http_byte_range().
[ticket/9627] Adding download unit tests.
[ticket/9627] Split http_range_request() into several functions.
[ticket/9627] Make sure range request reads till the end of the file.
[ticket/9627] Make use of 'static' since the function is called more than once
[ticket/9627] Make sure the database record for the filesize is correct.
[ticket/9627] Do not increase download counter if file is requested partially.
[ticket/9627] Support for HTTP range requests in download/file.php
* develop-olympus:
[ticket/9478] Validate maximum number of allowed recipients per PM value.
[ticket/9686] Fix mssqlnative database data export
[ticket/9595] List min/max characters indexed by search for mysql_fulltext.
[ticket/9101] Remove misleading 'below' from RECAPTCHA_EXPLAIN.
[ticket/9853] Change recaptcha theme from default to 'clean'.
* ticket/bantu/9101:
[ticket/9101] Remove misleading 'below' from RECAPTCHA_EXPLAIN.
* ticket/bantu/9595:
[ticket/9595] List min/max characters indexed by search for mysql_fulltext.
* ticket/bantu/9853:
[ticket/9853] Change recaptcha theme from default to 'clean'.
To allow execution of the tests with different configurations without having
to use the test_config.php file, environment variables of the form
PHPBB_TEST_<name> can now be used, e.g. PHPBB_TEST_DBMS to set the variables
otherwise expected in test_config.php
PHPBB3-9868
Tests are run with sqlite by default now anyway, so in the majority of cases
the error message explaining how to set up database test running will not be
displayed anyway. Database tests are now generally simply skipped if no
configuration can be found. The RUNNING_TESTS.txt file explains how to set
them up however, and more info is available on the wiki.
The get_database_config method was moved from test_case_helpers to
database_test_case because it has no general purpose.
PHPBB3-9868
Calling initialisation to then use the member directly seems more
complicated than just having a method that returns the instance or
creates it if necessary.
PHPBB3-9868
We require version 1.1 of the sqlsrv extension anyway so the regular
sqlsrv_num_rows can be used instead of buffering the result. The result
buffer (class result_mssqlnative) should never automatically free the
resource it receives - we consistently close resources using sql_freeresult().
PHPBB3-9686
