* dhruvgoel92/ticket/11271-develop: (25 commits)
[ticket/11271] Make path conversion more precise
[ticket/11271] limit absolute path conversion to attachment links only
[ticket/11271] Add docblock of feed_generate_content( )
[ticket/11271] Fix tabs and use !empty( ) instead of count( )
[ticket/11271] Remove unnecessary inclusion of functions_display
[ticket/11271] Typecast forum and topic id to integer
[ticket/11271] Use absolute path for displaying inline attachments in feeds
[ticket/11271] Changed executable bit.
[ticket/11271] Formatting code and removing null assignment.
[ticket/11271] Removing unnecessary database object
[ticket/11271] Separated attachment fetching query
[ticket/11271] Fetched feed attachments before loop.
[ticket/11271] Removed in-line attachment comments properly.
[ticket/11271] Displaying in-line attached images in ATOM feed.
[ticket/11271] Add the inline images html to content
[ticket/11271] Use class variable $db instead of global
[ticket/11271] Typecast forum and topic id to integer
[ticket/11271] Use absolute path for displaying inline attachments in feeds
[ticket/11271] Changed executable bit.
[ticket/11271] Formatting code and removing null assignment.
...
* dhruvgoel92/ticket/11288-develop:
[ticket/11288] Add unit test cases for foo-bar like queries
[ticket/11288] Handle +,- without preceeding whitespace characters
* remotes/upstream/develop-olympus:
[ticket/12106] Combined first and second sentence
[ticket/12106] Adds a explaination that admin/mods still able to use the board
Conflicts:
phpBB/language/en/acp/board.php
* remotes/dhruvgoel92/ticket/10945-develop:
[ticket/10945] Remove mark test incomplete for native search backend
[ticket/10945] Fix Unit Tests as per new changes to split_keywords
[ticket/10945] Remove mark test incomplete for mysql and postgres
[ticket/10945] Fix return values for split_keywords function
[ticket/10945] Display search query when search fails in native search
[ticket/10945] remove trigger_error call
If search fails and common words are present, split_keywords returns false
and search.php file prints appropriate message of common words.
If search fails and there are no common words, split_keywords returns true
and keyword_search returns false so that the search query is displayed in
search box.
PHPBB3-10945
removes trigger_error call incase no search results are found or start
variable exceeds the amount. So that search query is displayed in the
search box even if no results are returned.
PHPBB3-10945
# By Varun Agrawal
# Via Varun Agrawal
* VarunAgw/ticket/12250:
[ticket/12250] Remove deprecated phpbb_clean_path function
[ticket/12250] Remove deprecated phpbb_clean_path function
The function phpbb_clean_path() in functions.php is deprecated and is
replaced by filesystem class. Therefore, this function is moved to the
functions_compatibility file.
PHPBB3-12250
