* github-bantu/ticket/10969:
[ticket/10969] Also remove COMMENTS key from data array in get_available_dbms()
[ticket/10969] Remove remove_remarks(&$sql) and remove_comments(&$output).
* nickvergessen/ticket/10942:
[ticket/10942] Avoid possible conflicts with magic words in unit tests
[ticket/10942] Add access modifiers
[ticket/10942] Use ANSI SQL standard || in dbal.php
[ticket/10942] Fix up unit tests for sql_case()
[ticket/10942] Require same data type and do not cast expressions automatically
[ticket/10942] Make unit tests for sql_case simpler
[ticket/10942] Add a comment why we cast to sql_case()
[ticket/10942] Rename method sql_conditional() to sql_case()
[ticket/10942] Change term string to expression to avoid confusion
[ticket/10942] Fix sql_conditional for mssql, postgre and oracle
[ticket/10942] Fix function name on order_lower_test.php
[ticket/10942] Add unit tests for sql_concatenate
[ticket/10942] Add sql_concatenate to dbal
[ticket/10942] Add unit tests for sql_conditional
[ticket/10942] Add sql_conditional to dbal
When performing an action on users in the ACP Inactive Users, such as activating, deleting, or reminding, trigger_error is now called to give a notification that the action was performed
PHPBB3-7598
using keyword_search method instead of get_name to distinguish between the
search backend classes present in includes/search and other helper classes.
PHPBB3-10946
Break the classes in functions-sphinx.php into different files
with proper class names according to phpbb class auto loader conventions.
PHPBB3-10946
Conflicts:
phpBB/includes/search/sphinx/config.php
Uses sql_build_query for JOIN query. Remove casting to int and space for
phpbb conventions to be followed
PHPBB3-10946
Conflicts:
phpBB/includes/search/fulltext_sphinx.php
A new method to handle this type of path was added and
compile_tag_include, compile_tag_include_php and
compile_tag_include_js were modified to use it appropriately.
Tests were added for these three macros also.
PHPBB3-10970
* develop-olympus:
[ticket/10937] Update documentation to say which comment styles are removed.
[ticket/10937] Comment removal functions: Restore backward compatibility
* prep-release-3.0.11:
[ticket/10937] Update documentation to say which comment styles are removed.
[ticket/10937] Comment removal functions: Restore backward compatibility
* bantu/ticket/10937:
[ticket/10937] Update documentation to say which comment styles are removed.
[ticket/10937] Comment removal functions: Restore backward compatibility
* dhruvgoel92/feature/postgresql-fulltext-search: (28 commits)
[feature/postgresql-fulltext-search] supports_phrase_search function
[feature/postgresql-fulltext-search] use proper variable name
[feature/postgresql-fulltext-search] each config is checked if it is set
[feature/postgresql-fulltext-search] fix formatting
[feature/postgresql-fulltext-search] add docblocks to functions
[feature/postgresql-fulltext-search] remove phrase search code
[feature/postgresql-fulltext-search] define access control specifiers
[feature/postgresql-fulltext-search] use version_compare
[feature/postgresql-fulltext-search] fix language key
[feature/postgresql-fulltext-search] remove Readme
[feature/postgresql-fulltext-search] removes pcre check
[feature/postgresql-fulltext-search] fix language tsearch2 to text search
[feature/postgresql-fulltext-search] remove mbstring support
[feature/postgresql-fulltext-search] change language for pgsql < 8.3
[feature/postgresql-fulltext-search] use phpbb_pcre_utf8_support()
[feature/postgresql-fulltext-search] fix variable name
[feature/postgresql-fulltext-search] Fix version comparison for 9.0+.
[feature/postgresql-fulltext-search] fixing license
[feature/postgresql-fulltext-search] assign empty stats
[feature/postgresql-fulltext-search] remove backward compatibility
...
Unused Code for phrase search removed as pgsql doesnt support it. An added
message is displayed if user tries to perform exact phrase search.
PHPBB3-9730