From 9f1f6f96ceaf0870dabd0cf68c40292682c04aa2 Mon Sep 17 00:00:00 2001
From: MateBartus <mate.bartus@gmail.com>
Date: Tue, 28 Apr 2015 22:52:43 +0200
Subject: [ticket/13762] Optional DI injectable default language module array
PHPBB3-13762
---
phpBB/phpbb/language/language.php | 19 ++++++++++++++-----
1 file changed, 14 insertions(+), 5 deletions(-)
(limited to 'phpBB/phpbb/language')
diff --git a/phpBB/phpbb/language/language.php b/phpBB/phpbb/language/language.php
index 9c9a3b8df1..3298908365 100644
--- a/phpBB/phpbb/language/language.php
+++ b/phpBB/phpbb/language/language.php
@@ -73,9 +73,10 @@ class language
/**
* 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;
@@ -92,9 +93,17 @@ class language
);
// Common language files
- $this->common_language_files = array(
- 'common',
- );
+ if (is_array($common_modules))
+ {
+ $this->common_language_files = $common_modules;
+ }
+ else
+ {
+ $this->common_language_files = array(
+ 'common',
+ );
+ }
+
$this->common_language_files_loaded = false;
$this->language_fallback = array(self::FALLBACK_LANGUAGE);
--
cgit v1.2.1