[ticket/11638] generate_text_for_display on viewtopic.php

lines: 835-843

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
[ticket/11638] generate_text_for_display on viewtopic.php

lines: 846-854

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
[ticket/11215] Don't try to use  when it isn't there
PHPBB3-112515
Merge branch 'develop' into ticket/11215

* develop:
  [ticket/11647] Always use &amp; for URLs
  [ticket/11647] Allow custom ports
  [ticket/11647] Use $config for assets_version
  [ticket/11647] Fix invalid variable name
  [ticket/11647] New assets handling
  [ticket/11647] Fix tests for INCLUDEJS
[ticket/11638] generate_text_for_display on viewtopic.php

lines: 1395-1403

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
[ticket/11638] generate_text_for_display on viewtopic.php

lines: 1403-1417

sub-task of ticket PHPBB3-11635:
find and fix all bypasses of generate_text_for_*

PHPBB3-11638
Merge branch 'develop' into ticket/11215

* develop: (214 commits)
  [ticket/10999] Fix assets_version in ACP
  [prep-release-3.0.12] More changelog items for the 3.0.12 release.
  [ticket/11687] Add assets_version to phpbb_config
  [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
  [ticket/11674] Do not include vendor folder if there are no dependencies.
  [ticket/11685] Remove logout confirmation page
  [ticket/11684] Remove useless confirmation page after login and admin login
  [ticket/9657] Define user before injecting
  [ticket/9657] Remove old code
  [ticket/9657] Keep approval state of posts/topics when copying them
  [ticket/9657] Add functional tests for forking a copy
  [ticket/9657] Add functional test for splitting topic
  [ticket/11112] Do not change opensource.org link to https
  [ticket/9657] Add functional test for restoring a post/topic
  [ticket/11112] Use https for user-visible links to phpbb.com
  [ticket/9657] Fix a little error when moving softdeleted topics
  [ticket/9657] Add unit tests for softdeleting and moving posts/topics
  [ticket/9657] Remove last references to m_restore permission
  [ticket/9657] Fix english language :(
  [ticket/9657] Notifications do not require emails or jabber anymore
  ...
Merge branch 'develop' into ticket/11215

* develop:
  [ticket/11675] Fix template loop
  [ticket/11690] Old module class names may get autoloaded by class_exists
  [ticket/9649] Display information on index for moderators on unapproved posts
  [ticket/11686] Not checking for phpBB Debug errors on functional tests
  [ticket/11553] Typo
  [ticket/11553] Replace bullet with unicode
  [ticket/11553] Move bulletin points to pseudo class
  [ticket/11600] Remove duplicate test case
  [ticket/11600] Use lowercase null and remove duplicate test cases
  [ticket/11600] Use local variable for $user in test_localize_errors
  [ŧicket/11600] Split get driver tests into tests for all and only enabled ones
  [ticket/11600] Increase code test coverage of avatar manager
Merge branch 'develop' into ticket/11215

* develop:
  [ticket/11694] Do not locate assets with root path
[ticket/11574] Fix various path issues in the updater

PHPBB3-11574
[ticket/11574] Fix table prefix in database updater

PHPBB3-11574
[ticket/11574] Add trailing slash for consistency

PHPBB3-11574
Merge pull request #7 from igorw/ticket/11574

[ticket/11574] Fix various path issues in the updater
Merge remote-tracking branch 'upstream/develop' into ticket/11574

* upstream/develop: (575 commits)
  [ticket/11702] Fix forum_posts left over for link-click counts in viewforum.php
  [ticket/11696] Move file to new directory
  [ticket/11696] Rename constructor to __construct()
  [ticket/11696] Remove manual loading of db_tools in extension controller test
  [ticket/11696] Rename db_tools.php so it can be autoloaded
  [ticket/11698] Moving all autoloadable files to phpbb/
  [ticket/11694] Do not locate assets with root path
  [ticket/11692] Don't update search_type in dev migration if already appended
  [ticket/11675] Fix template loop
  [ticket/11690] Old module class names may get autoloaded by class_exists
  [ticket/9649] Display information on index for moderators on unapproved posts
  [ticket/10999] Fix assets_version in ACP
  [prep-release-3.0.12] More changelog items for the 3.0.12 release.
  [ticket/11687] Add assets_version to phpbb_config
  [ticket/11686] Not checking for phpBB Debug errors on functional tests
  [ticket/11670] Consistency with logo: Replace "phpBB(tm)" with "phpBB(R)".
  [ticket/11674] Do not include vendor folder if there are no dependencies.
  [ticket/11685] Remove logout confirmation page
  [ticket/11684] Remove useless confirmation page after login and admin login
  [ticket/9657] Define user before injecting
  ...

Conflicts:
	phpBB/includes/functions_container.php
	phpBB/install/database_update.php
	phpBB/install/index.php
[ticket/11582] Add new service for permissions

Replace calls to the language-array type with a call to get_types()

PHPBB3-11582
[ticket/11582] Use new class for categories

PHPBB3-11582
[ticket/11582] Fix event dispatcher class name

PHPBB3-11582
[ticket/11582] Add event in constructor and add docs

PHPBB3-11582
[ticket/11582] Add methods to return the language string

PHPBB3-11582
[ticket/11582] Use new methods and remove duplicated entries

PHPBB3-11582