Merge branch '3.2.x'

2025-07-31 14:00:31 +02:00 · 2017-10-31 09:58:33 +01:00
parent 0c009e3feb fbbd1713d7
commit ea23d456d5
4 changed files with 88 additions and 28 deletions
--- a/phpBB/config/default/container/services_feed.yml
+++ b/phpBB/config/default/container/services_feed.yml
@@ -18,9 +18,10 @@ services:
        class: phpbb\feed\helper
        arguments:
            - '@config'
+            - '@service_container'
+            - '@path_helper'
+            - '@text_formatter.renderer'
            - '@user'
-            - '%core.root_path%'
-            - '%core.php_ext%'

    feed.forum:
        class: phpbb\feed\forum
@@ -78,6 +79,10 @@ services:
            - '@dispatcher'
            - '%core.php_ext%'

+    feed.quote_helper:
+        class: phpbb\feed\quote_helper
+        parent: text_formatter.s9e.quote_helper
+
    feed.topic:
        class: phpbb\feed\topic
        shared: false