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

[ticket/13762] Optional DI injectable default language module array

Browse source 
PHPBB3-13762
This commit is contained in:
MateBartus 2015-04-28 22:52:43 +02:00
parent 179a470022
commit 9f1f6f96ce
1 changed files with 14 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
phpBB/phpbb/language/language.php
View file

@ -74,8 +74,9 @@ class language
* Constructor * Constructor
* *
* @param \phpbb\language\language_file_loader $loader Language file loader * @param \phpbb\language\language_file_loader $loader Language file loader
* @param array|null $common_modules Array of common language modules to load (optional)
*/ */
public function __construct(language_file_loader $loader) public function __construct(language_file_loader $loader, $common_modules = null)
{ {
$this->loader = $loader; $this->loader = $loader;
@ -92,9 +93,17 @@ class language
); );
// Common language files // Common language files
if (is_array($common_modules))
{
$this->common_language_files = $common_modules;
}
else
{
$this->common_language_files = array( $this->common_language_files = array(
'common', 'common',
); );
}
$this->common_language_files_loaded = false; $this->common_language_files_loaded = false;
$this->language_fallback = array(self::FALLBACK_LANGUAGE); $this->language_fallback = array(self::FALLBACK_LANGUAGE);