diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html index f1d60b2b8f..c198ae6a73 100644 --- a/phpBB/docs/CHANGELOG.html +++ b/phpBB/docs/CHANGELOG.html @@ -132,6 +132,7 @@
  • [Fix] Correctly check if install directory is still present. (Bug #46965 - Patch by rxu)
  • [Fix] Correct banned user behaviour when "force password change" is enabled (Bug #47145 - Patch by nickvergessen and leviatan21 )
  • [Fix] Correctly display ACP logs options, without permission to clear logs. (Bug #24155 - Patch by leviatan21)
  • +
  • [Fix] Display topic icons in MCP forum view again (only prosilver).
  • [Change] Change the data format of the default file ACM to be more secure from tampering and have better performance.
  • [Change] Add index on log_time to the log table to prevent slowdown on boards with many log entries. (Bug #44665 - Patch by bantu)
  • [Change] Template engine now permits to a limited extent variable includes.
  • diff --git a/phpBB/style.php b/phpBB/style.php index a5c50e7fec..40d34c598c 100644 --- a/phpBB/style.php +++ b/phpBB/style.php @@ -289,4 +289,4 @@ if ($id) exit; -?> +?> \ No newline at end of file diff --git a/phpBB/styles/prosilver/template/mcp_forum.html b/phpBB/styles/prosilver/template/mcp_forum.html index 05e4e2c8a2..2c98f7c9fa 100644 --- a/phpBB/styles/prosilver/template/mcp_forum.html +++ b/phpBB/styles/prosilver/template/mcp_forum.html @@ -35,7 +35,7 @@
  • -
    style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"> +
    style="background-image: url({T_ICONS_PATH}{topicrow.TOPIC_ICON_IMG}); background-repeat: no-repeat;"> [ {L_SELECT_MERGE} ]   {topicrow.TOPIC_TITLE} {topicrow.UNAPPROVED_IMG}