Merge branch 'develop' of https://github.com/phpbb/phpbb3 into feature/avatars

Conflicts: phpBB/includes/ucp/ucp_groups.php
2025-08-11 03:04:09 +02:00 · 2013-01-04 10:49:57 +01:00
parent 4a8b1a6e05 228580b674
commit 5d091e2d8f
53 changed files with 731 additions and 288 deletions
--- a/phpBB/config/services.yml
+++ b/phpBB/config/services.yml
@@ -25,6 +25,10 @@ services:
        class: phpbb_cache_service
        arguments:
             - @cache.driver
+             - @config
+             - @dbal.conn
+             - %core.root_path%
+             - %core.php_ext%

    cache.driver:
        class: %cache.driver.class%
@@ -138,6 +142,13 @@ services:
            - @dispatcher
            - @controller.resolver

+    hook_finder:
+        class: phpbb_hook_finder
+        arguments:
+            - %core.root_path%
+            - .%core.php_ext%
+            - @cache.driver
+
    kernel_request_subscriber:
        class: phpbb_event_kernel_request_subscriber
        arguments: