mirror of
https://github.com/phpbb/phpbb.git
synced 2025-07-31 05:50:42 +02:00
Merge remote-tracking branch 'github-phpbb/develop' into ticket/11700
* github-phpbb/develop: (586 commits) [ticket/11735] Display disabled checkbox in subsilver for read notifications [ticket/11735] Display disabled checkbox when notification is already read [ticket/11844] update acp/authentication language var [ticket/11795] Remove PM popup [ticket/11795] Remove outdated comment from forum_fn.js [ticket/11795] Move find user JS to forum_fn [ticket/11795] Replace TWIG with phpBB syntax in ACP [ticket/11795] Move MSN scripts to forum_fn.js [ticket/11795] Use phpBB template syntax instead of TWIG [ticket/11795] Move PM popup JS to forum_fn.js [ticket/11795] Get rid of pagination JS variables [ticket/11795] Get rid of onload_functions [ticket/11795] Use data-reset-on-edit attr to reset elements [ticket/11795] Redo form elements auto-focus [ticket/11811] Remove outline on :focus [ticket/11836] Fix subsilver fatal error [ticket/11837] Replace escaped single quote with utf-8 single quote [ticket/11836] Fix fatal error on unsupported provider for auth link [ticket/11837] Translate UCP_AUTH_LINK_NOT_SUPPORTED [ticket/11809] Ensure code.js is first script included after jQuery ... Conflicts: phpBB/config/services.yml phpBB/develop/create_schema_files.php phpBB/develop/mysql_upgrader.php phpBB/download/file.php phpBB/includes/bbcode.php phpBB/includes/functions_container.php phpBB/install/database_update.php phpBB/install/index.php phpBB/phpbb/controller/helper.php phpBB/phpbb/controller/resolver.php phpBB/phpbb/request/request_interface.php phpBB/phpbb/session.php phpBB/phpbb/style/extension_path_provider.php phpBB/phpbb/style/path_provider.php phpBB/phpbb/style/path_provider_interface.php phpBB/phpbb/style/resource_locator.php phpBB/phpbb/style/style.php phpBB/phpbb/template/locator.php phpBB/phpbb/template/template.php phpBB/phpbb/template/twig/node/includeasset.php phpBB/phpbb/template/twig/node/includecss.php phpBB/phpbb/template/twig/node/includejs.php phpBB/phpbb/template/twig/twig.php tests/controller/helper_url_test.php tests/di/create_container_test.php tests/extension/style_path_provider_test.php tests/notification/notification_test.php tests/session/continue_test.php tests/session/creation_test.php tests/template/template_events_test.php tests/template/template_test_case.php tests/template/template_test_case_with_tree.php tests/test_framework/phpbb_functional_test_case.php
This commit is contained in:
@@ -77,7 +77,7 @@ class user extends \phpbb\session
|
||||
*/
|
||||
function setup($lang_set = false, $style_id = false)
|
||||
{
|
||||
global $db, $phpbb_style, $template, $config, $auth, $phpEx, $phpbb_root_path, $cache;
|
||||
global $db, $template, $config, $auth, $phpEx, $phpbb_root_path, $cache;
|
||||
global $phpbb_dispatcher;
|
||||
|
||||
if ($this->data['user_id'] != ANONYMOUS)
|
||||
@@ -130,6 +130,7 @@ class user extends \phpbb\session
|
||||
}
|
||||
|
||||
$user_data = $this->data;
|
||||
$lang_set_ext = array();
|
||||
|
||||
/**
|
||||
* Event to load language files and modify user data on every page
|
||||
@@ -141,10 +142,18 @@ class user extends \phpbb\session
|
||||
* @var string user_timezone User's timezone, should be one of
|
||||
* http://www.php.net/manual/en/timezones.php
|
||||
* @var mixed lang_set String or array of language files
|
||||
* @var array lang_set_ext Array containing entries of format
|
||||
* array(
|
||||
* 'ext_name' => (string) [extension name],
|
||||
* 'lang_set' => (string|array) [language files],
|
||||
* )
|
||||
* For performance reasons, only load translations
|
||||
* that are absolutely needed globally using this
|
||||
* event. Use local events otherwise.
|
||||
* @var mixed style_id Style we are going to display
|
||||
* @since 3.1-A1
|
||||
*/
|
||||
$vars = array('user_data', 'user_lang_name', 'user_date_format', 'user_timezone', 'lang_set', 'style_id');
|
||||
$vars = array('user_data', 'user_lang_name', 'user_date_format', 'user_timezone', 'lang_set', 'lang_set_ext', 'style_id');
|
||||
extract($phpbb_dispatcher->trigger_event('core.user_setup', compact($vars)));
|
||||
|
||||
$this->data = $user_data;
|
||||
@@ -175,6 +184,12 @@ class user extends \phpbb\session
|
||||
$this->add_lang($lang_set);
|
||||
unset($lang_set);
|
||||
|
||||
foreach ($lang_set_ext as $ext_lang_pair)
|
||||
{
|
||||
$this->add_lang_ext($ext_lang_pair['ext_name'], $ext_lang_pair['lang_set']);
|
||||
}
|
||||
unset($lang_set_ext);
|
||||
|
||||
$style_request = request_var('style', 0);
|
||||
if ($style_request && $auth->acl_get('a_styles') && !defined('ADMIN_START'))
|
||||
{
|
||||
@@ -238,7 +253,7 @@ class user extends \phpbb\session
|
||||
}
|
||||
}
|
||||
|
||||
$phpbb_style->set_style();
|
||||
$template->set_style();
|
||||
|
||||
$this->img_lang = $this->lang_name;
|
||||
|
||||
@@ -592,6 +607,13 @@ class user extends \phpbb\session
|
||||
$language_filename = $lang_path . $this->lang_name . '/' . $filename . '.' . $phpEx;
|
||||
}
|
||||
|
||||
// If we are in install, try to use the updated version, when available
|
||||
$install_language_filename = str_replace('language/', 'install/update/new/language/', $language_filename);
|
||||
if (defined('IN_INSTALL') && file_exists($install_language_filename))
|
||||
{
|
||||
$language_filename = $install_language_filename;
|
||||
}
|
||||
|
||||
if (!file_exists($language_filename))
|
||||
{
|
||||
global $config;
|
||||
|
Reference in New Issue
Block a user