diff options
| author | Mate Bartus <mate.bartus@gmail.com> | 2015-10-28 14:14:49 +0100 |
|---|---|---|
| committer | Mate Bartus <mate.bartus@gmail.com> | 2015-10-28 14:14:49 +0100 |
| commit | 3ac10ef5443a1bbc8aa2f13b7fb98f33ca2ff702 (patch) | |
| tree | 5b5416bcb93f9b3e665e0f0e9f91b2ffaf31f4ac /phpBB/phpbb | |
| parent | 33db26d0cf3161edb7c840c499c94f5b8f14a4e9 (diff) | |
| download | forums-3ac10ef5443a1bbc8aa2f13b7fb98f33ca2ff702.tar forums-3ac10ef5443a1bbc8aa2f13b7fb98f33ca2ff702.tar.gz forums-3ac10ef5443a1bbc8aa2f13b7fb98f33ca2ff702.tar.bz2 forums-3ac10ef5443a1bbc8aa2f13b7fb98f33ca2ff702.tar.xz forums-3ac10ef5443a1bbc8aa2f13b7fb98f33ca2ff702.zip | |
[ticket/14044] Solve missing email template error
PHPBB3-14044
Diffstat (limited to 'phpBB/phpbb')
| -rw-r--r-- | phpBB/phpbb/install/module/install_finish/task/notify_user.php | 8 | ||||
| -rw-r--r-- | phpBB/phpbb/language/language.php | 10 |
2 files changed, 17 insertions, 1 deletions
diff --git a/phpBB/phpbb/install/module/install_finish/task/notify_user.php b/phpBB/phpbb/install/module/install_finish/task/notify_user.php index 83c03ce367..1cbc27ab6a 100644 --- a/phpBB/phpbb/install/module/install_finish/task/notify_user.php +++ b/phpBB/phpbb/install/module/install_finish/task/notify_user.php @@ -41,6 +41,11 @@ class notify_user extends \phpbb\install\task_base protected $config; /** + * @var \phpbb\language\language + */ + protected $language; + + /** * @var \phpbb\log\log_interface */ protected $log; @@ -75,6 +80,7 @@ class notify_user extends \phpbb\install\task_base $this->iohandler = $iohandler; $this->auth = $container->get('auth'); + $this->language = $container->get('language'); $this->log = $container->get('log'); $this->user = $container->get('user'); $this->phpbb_root_path = $phpbb_root_path; @@ -103,7 +109,7 @@ class notify_user extends \phpbb\install\task_base include ($this->phpbb_root_path . 'includes/functions_messenger.' . $this->php_ext); $messenger = new \messenger(false); - $messenger->template('installed', $this->install_config->get('language')); + $messenger->template('installed', $this->language->get_used_language()); $messenger->to($this->config['board_email'], $this->install_config->get('admin_name')); $messenger->anti_abuse_headers($this->config, $this->user); $messenger->assign_vars(array( diff --git a/phpBB/phpbb/language/language.php b/phpBB/phpbb/language/language.php index 47f055f56a..c4e48a4c0d 100644 --- a/phpBB/phpbb/language/language.php +++ b/phpBB/phpbb/language/language.php @@ -549,6 +549,16 @@ class language } /** + * Returns the ISO code of the used language + * + * @return string The ISO code of the currently used language + */ + public function get_used_language() + { + return $this->language_fallback[0]; + } + + /** * Returns language fallback data * * @param bool $reload Whether or not to reload language files |