* develop-olympus:
[ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:"
[ticket/9012] Adjust shadow topic title to the title at the time it was moved.
Conflicts:
phpBB/styles/subsilver2/template/editor.js
phpBB/styles/subsilver2/template/posting_topic_review.html
phpBB/styles/subsilver2/template/ucp_pm_history.html
When quoting from the topic-review the statement "Author wrote:" is missing. The fix for this was not complete: Now it's backwards compatibile and uses the LA_ for the language variables.
PHPBB3-9531
* develop-olympus:
[ticket/9653] Valid XHTML with code BBCode in subsilver2 viewtopic signatures
[ticket/9656] Remove @ from phpinfo() to get correct error_reporting value.
[ticket/9665] Allow preview of signature when it is the string "0".
[ticket/9112] Make sure current user can see most active forum/topic.
[ticket/9655] Pass E_USER_WARNING, so it doesn't look like a successful action.
[ticket/9643] Only split $port from $sqlserver, if it's not an IPv6 address.
Conflicts:
phpBB/styles/subsilver2/template/ucp_profile_signature.html
phpBB/styles/subsilver2/template/viewtopic_body.html
Since only the SIGNATURE_PREVIEW parameter is evaluated in the templates
<!-- IF SIGNATURE_PREVIEW --> will not allow the signature to be "0".
<!-- IF SIGNATURE_PREVIEW != '' --> however does allow "0".
PHPBB3-9665
This has been introduced by merge of c7a25c58b893fc72ffb3746374ece9de1d388531, which was not supposed to be merged. 1b2a65333b5be1f6086bbd1d438e061041bd2b75 was supposed to be merged instead.
PHPBB3-9587
* develop-olympus:
[feature/dbal-tests] Follow the coding guidelines and ...
[feature/dbal-tests] Update data
[feature/dbal-tests] Multi insert
[feature/dbal-tests] Delete data
[feature/dbal-tests] Insert data
[feature/dbal-tests] Fix SQL-ERROR: invalid input syntax for integer: ""
[ticket/9587] Prosilver overrides reCaptcha class.
[ticket/9605] Wrong class added to topiclist, when there's no announcement topic.
* develop-olympus:
[ticket/9094] Hide "Copy permissions" message, when permissions were copied.
[ticket/9135] Fix report-icon for moderators in PM folders.
[ticket/8936] Subsilver2 missing reply-to-all feature.
[ticket/7782] Return 404 HTTP status code for nonexistent attachments.
[ticket/7782] Added spaces.
[ticket/7782] Added phpdoc comment for send_status_line function.
[ticket/7782] Send status line using refactored download/file.php logic.
[ticket/8792] Add LDAP_SEARCH_FAILED string for when ldap_search() fails.
There was a S_TOPIC_REPORTED switch in the template of prosilver, which should indicate whether the PM is reported. But the variable was neither filled, nor named correctly. Now it is filled with a boolean and a link to the report is displayed for permitted users.
PHPBB3-9135
* develop-olympus: (21 commits)
[feature/notify_status] Define'd constants for notify_status
[ticket/7782] Send 404 HTTP code when a nonexistent user/forum/topic is requested.
[ticket/9530] The prosilver problem in #9531 exists in subsilver2 editor.js
[ticket/9530] Subsilver2 is missing BBCode-less quotes fallback-option when bbcodes are disabled.
[ticket/9531] BBCode-less quotes fallback-option is missing "Author wrote:" line when quoting from topic-review.
[ticket/9547] Use separate constants for display/enable active topics.
[ticket/9535] Also fix the margin in the install_update.html
[ticket/9535] Fix some more rtl margin issues.
[ticket/9535] Correctly set margin of textarea in ACP > Users signature for RTL languages.
[ticket/9524] IPv6 regex does not match all valid IPv6 addresses starting with ::
[ticket/9510] Unable to copy permissions from and to forums you cannot see
[ticket/9510] Unable to copy permissions from and to forums you cannot see
[ticket/9545] Initial forum should display active topics by default.
[ticket/9546] Also delete bookmarks, when a topic is deleted.
[ticket/9529] Topic review is not showing all selected posts.
[ticket/9528] Also fall back to bbcode-less quotes for PMs, when bbcodes are disabled.
[ticket/9146] Fix double occurring tabindex="6" in prosilver's QR
[ticket/9119] Respect language selection on automated update.
[ticket/8894] Fix JavaScript-Error and hide Quote-Button on topic review if BBCodes are not allowed.
[ticket/9567] Newly registered users group description rewording.
...
* develop-olympus:
[bug/9047] Use correct forum_id to generate the active topics list. (Bug #9047)
[bug/9512] Fix dead link in MCP on reports for global announcements in prosilver. (Bug #9512)
[feature/unapproved-posts-in-feed] Little changelog correction
[feature/unapproved-posts-in-feed] Increase performance of is_moderator_approve_forum() as per bantu
[feature/unapproved-posts-in-feed] View note for moderators on unapproved posts/topics with unapproved posts in ATOM Feed
[bug/58745] Correct changelog message
[bug/58745] Correctly close user-delete-form in ACP User Overview (Bug #58745)
[bug/58695] Use method to get forums where user is moderator, thanks to bantu for the hint
[bug/58695] Only show unapproved posts in ATOM Feeds for moderators (Bug #58695)
[bug/59465] Remove start=0 from topic pagination links.
[bug/59465] Removes start=0 from URLs used by viewtopic and viewforum.
