* dhruvgoel92/feature/sphinx-fulltext-search: (57 commits)
[feature/sphinx-fulltext-search] add sphinx to Authors file
[feature/sphinx-fulltext-search] add sphinxapi.php file
[feature/sphinx-fulltext-search] fix auth bug
[feature/sphinx-fulltext-search] remove unused property
[feature/sphinx-fulltext-search] use 9312 as default port
[feature/sphinx-fulltext-search] fix language of host config
[feature/sphinx-fulltext-search] fix sphinx for arbitary host
[feature/sphinx-fulltext-search] coding changes acc to phbb conventions
[feature/sphinx-fulltext-search] fixing comments
[feature/sphinx-fulltext-search] add trailing slash in language
[feature/sphinx-fulltext-search] improve port option
[feature/sphinx-fulltext-search] remove stopwords and config path
[feature/sphinx-fulltext-search] makes sql host configurable
[feature/sphinx-fulltext-search] use readonly instead of disabled
[feature/sphinx-fulltext-search] fix language keys' typo
[feature/sphinx-fulltext-search] remove note from db_tools
[feature/sphinx-fulltext-search] add support for postgres
[feature/sphinx-fulltext-search] add pgsql functionality
[feature/sphinx-fulltext-search] use Update in sphinx query
[feature/sphinx-fulltext-search] use CASE instead of IF
...
* develop-olympus:
[ticket/10965] Database update was referring to 3.0.5 instead of 3.0.11-RC1
[ticket/10965] Introduce a new profile field option to display no value
Conflicts:
phpBB/includes/acp/acp_profile.php
By default the 3.0.10 behaviour is kept, profile fields will not show up
if they have either not yet been selected or in case of an optional
dropdown field if the novalue option was selected.
PHPBB3-10965
Extracted common template code for prosilver as per subsilver2.
Various other fixups and oversight corrections, changed name
of the "new" template function and re-introduced existing
version. Altered on_page to compensate for removal of some
templating vars from pagination routine.
PHPBB3-10968
Since phpBB 2 pagination has been rendered mostly within the source. This
limits just what designers can do with pagination. The current form is also
questionable in terms of "best practice". The aim is to move rendering
completely to the template via the use of a block element. Enabling S_
template vars also allows for control over specific aspects of the
pagination output such as next, previous, active and ellipsis.
Related to this - merging the capabilities of the topic_generate_pagination
with generate_pagination removes an element of duplication.
PHPBB3-10968
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
