mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-31 22:10:45 +02:00
Code Issues Releases Wiki Activity

[ticket/17191] Inject variables from composer.json when loading language files

Browse Source 
PHPBB3-17191
This commit is contained in:
Marc Alexander
2023-10-04 21:16:54 +02:00
parent 4baa3e778d
commit dc9ef40669
10 changed files with 69 additions and 100 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -23,7 +23,6 @@ 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;
@@ -94,11 +93,6 @@ class feed
*/
protected $language;
/**
* @var language_file_helper
*/
protected $lang_helper;
/**
* Constructor
*
@@ -114,9 +108,8 @@ 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, 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)
{
$this->request = $request;
$this->controller_helper = $controller_helper;
@@ -130,7 +123,6 @@ class feed
$this->template = $twig;
$this->language = $language;
$this->phpbb_dispatcher = $phpbb_dispatcher;
$this->lang_helper = $lang_helper;
}
/**
@@ -395,7 +387,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->lang_helper->get_lang_key_value('user_lang', $this->user->data['user_lang']),
'FEED_LANG' => $this->language->lang('USER_LANG'),
'FEED_AUTHOR' => $this->config['sitename'],
// Feed entries