* develop-olympus:
[ticket/10549] using correct variable in includes/functions_module.php too
[ticket/10549] changed "right" to "incorrect"
Conflicts:
phpBB/includes/functions_module.php
Instead of searching for post_subject and post_text seperately and then
OR them in where clause we use concatenation of the two columns and search
PHPBB3-11040
* 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/11271:
[ticket/11271] Make path conversion more precise
[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.
* 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
