* EXreaction/ticket/11716:
[ticket/11716] Correct license URL
[ticket/11716] Fix dependencies in migration files
[ticket/11716] Rename migration files and add note that it's converting a MOD
[ticket/11716] Convert Soft Delete Mod to post/topic visibility
* 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/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
* github-nickvergessen/ticket/12235:
[ticket/12235] Convert WLM to custom profile field
[ticket/12187] Do not make clickable when using as contact field
[ticket/12187] Split generate_profile_fields_template() into 2 methods
[ticket/12187] Remove user_website field
[ticket/12187] Remove user_website functionality
[ticket/12187] Convert website field data to custom profile field
[ticket/12187] Add URL type for profile fields
[ticket/12234] Replace ICQ with custom profile field
[ticket/12233] Update schema file
[ticket/12233] Add images back to subsilver2
[ticket/12233] Allow profile fields to be contact fields
Conflicts:
phpBB/adm/style/acp_prune_users.html
Contact fields are displayed with in the contact section of the user profile
and are displayed differently in the mini profile next to posts and private
messages
PHPBB3-12233
The size of the template block array is calculated within a foreach loop
iterating through the array, which is unnecessary. It only needs to be done
once. In a block of 1000 rows, this results in
500,500 calls to sizeof() in this location. With this change, that's reduced to
1000.
PHPBB3-12232
