From a54f5c0ca0e6664a98f6af4c55ece455a22ffb79 Mon Sep 17 00:00:00 2001
From: Christian Schnegelberger <mail@crizzo.de>
Date: Fri, 22 Sep 2023 11:13:11 +0200
Subject: [PATCH] [ticket/17191] Add lang helper service to feed/controller

PHPBB3-17191
---
 phpBB/config/default/container/services_feed.yml |  1 +
 phpBB/phpbb/feed/controller/feed.php             | 12 ++++++++++--
 2 files changed, 11 insertions(+), 2 deletions(-)

diff --git a/phpBB/config/default/container/services_feed.yml b/phpBB/config/default/container/services_feed.yml
index 80caf546df..54c45d0c01 100644
--- a/phpBB/config/default/container/services_feed.yml
+++ b/phpBB/config/default/container/services_feed.yml
@@ -14,6 +14,7 @@ services:
             - '@event_dispatcher'
             - '@language'
             - '%core.php_ext%'
+            - '@language.helper.language_file'
 
     feed.helper:
         class: phpbb\feed\helper
diff --git a/phpBB/phpbb/feed/controller/feed.php b/phpBB/phpbb/feed/controller/feed.php
index d95cda5248..4faa70bc38 100644
--- a/phpBB/phpbb/feed/controller/feed.php
+++ b/phpBB/phpbb/feed/controller/feed.php
@@ -23,6 +23,7 @@ use phpbb\feed\exception\feed_unavailable_exception;
 use phpbb\feed\exception\unauthorized_exception;
 use phpbb\feed\helper as feed_helper;
 use phpbb\controller\helper as controller_helper;
+use phpbb\language\language_file_helper;
 use phpbb\symfony_request;
 use phpbb\user;
 use phpbb\language\language;
@@ -93,6 +94,11 @@ class feed
 	 */
 	protected $language;
 
+	/**
+	 * @var language_file_helper
+	 */
+	protected $lang_helper;
+
 	/**
 	 * Constructor
 	 *
@@ -108,8 +114,9 @@ class feed
 	 * @param dispatcher_interface $phpbb_dispatcher
 	 * @param language $language
 	 * @param string $php_ext
+	 * @param language_file_helper $lang_helper
 	 */
-	public function __construct(Environment $twig, symfony_request $request, controller_helper $controller_helper, config $config, driver_interface $db, ContainerInterface $container, feed_helper $feed_helper, user $user, auth $auth, dispatcher_interface $phpbb_dispatcher, language $language, $php_ext)
+	public function __construct(Environment $twig, symfony_request $request, controller_helper $controller_helper, config $config, driver_interface $db, ContainerInterface $container, feed_helper $feed_helper, user $user, auth $auth, dispatcher_interface $phpbb_dispatcher, language $language, $php_ext, language_file_helper $lang_helper)
 	{
 		$this->request = $request;
 		$this->controller_helper = $controller_helper;
@@ -123,6 +130,7 @@ class feed
 		$this->template = $twig;
 		$this->language = $language;
 		$this->phpbb_dispatcher = $phpbb_dispatcher;
+		$this->lang_helper = $lang_helper;
 	}
 
 	/**
@@ -387,7 +395,7 @@ class feed
 			'FEED_TITLE'			=> $this->config['sitename'],
 			'FEED_SUBTITLE'			=> $this->config['site_desc'],
 			'FEED_UPDATED'			=> $this->feed_helper->format_date($feed_updated_time),
-			'FEED_LANG'				=> $this->user->lang['USER_LANG'],
+			'FEED_LANG'				=> $this->lang_helper->get_lang_key_value('user_lang'),
 			'FEED_AUTHOR'			=> $this->config['sitename'],
 
 			// Feed entries