makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-08 04:18:52 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/17191] Add lang helper service to feed/controller

Browse source 
PHPBB3-17191
This commit is contained in:
Christian Schnegelberger 2023-09-22 11:13:11 +02:00 • committed by Marc Alexander
parent 5b79ac0fc9
commit a54f5c0ca0
No known key found for this signature in database
GPG key ID: 50E0D2423696F995
2 changed files with 11 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
phpBB/config/default/container/services_feed.yml
View file

@ -14,6 +14,7 @@ services:
- '@event_dispatcher'
- '@language'
- '%core.php_ext%'
- '@language.helper.language_file'
feed.helper:
class: phpbb\feed\helper

12
phpBB/phpbb/feed/controller/feed.php
View file

@ -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