diff options
| author | Mate Bartus <mate.bartus@gmail.com> | 2015-07-26 22:20:32 +0200 |
|---|---|---|
| committer | Mate Bartus <mate.bartus@gmail.com> | 2015-07-26 22:20:32 +0200 |
| commit | 495c0c6fb32ac0b720fccfeb640a0b3d5a32b98f (patch) | |
| tree | 5f82564969e127ef7caa49a2d1a2cbd11e6a8449 | |
| parent | f7641cd506bd8ad98e923ce84f9f39960a938a69 (diff) | |
| download | forums-495c0c6fb32ac0b720fccfeb640a0b3d5a32b98f.tar forums-495c0c6fb32ac0b720fccfeb640a0b3d5a32b98f.tar.gz forums-495c0c6fb32ac0b720fccfeb640a0b3d5a32b98f.tar.bz2 forums-495c0c6fb32ac0b720fccfeb640a0b3d5a32b98f.tar.xz forums-495c0c6fb32ac0b720fccfeb640a0b3d5a32b98f.zip | |
[ticket/13740] Move handle_language_select calls to the controllers
PHPBB3-13740
| -rw-r--r-- | phpBB/phpbb/install/controller/helper.php | 4 | ||||
| -rw-r--r-- | phpBB/phpbb/install/controller/install.php | 2 | ||||
| -rw-r--r-- | phpBB/phpbb/install/controller/installer_index.php | 2 |
3 files changed, 5 insertions, 3 deletions
diff --git a/phpBB/phpbb/install/controller/helper.php b/phpBB/phpbb/install/controller/helper.php index 6d591786c4..fdfa6821ed 100644 --- a/phpBB/phpbb/install/controller/helper.php +++ b/phpBB/phpbb/install/controller/helper.php @@ -114,8 +114,6 @@ class helper $this->router = $router; $this->phpbb_root_path = $phpbb_root_path; $this->phpbb_admin_path = $phpbb_root_path . 'adm/'; - - $this->handle_language_select(); } /** @@ -167,7 +165,7 @@ class helper /** * Handles language selector form */ - protected function handle_language_select() + public function handle_language_select() { $lang = null; diff --git a/phpBB/phpbb/install/controller/install.php b/phpBB/phpbb/install/controller/install.php index c21b0d831b..80f6651a39 100644 --- a/phpBB/phpbb/install/controller/install.php +++ b/phpBB/phpbb/install/controller/install.php @@ -176,6 +176,8 @@ class install // Determine whether the installation was started or not if (true) { + $this->controller_helper->handle_language_select(); + // Set active stage $this->menu_provider->set_nav_property( array('install', 0, 'introduction'), diff --git a/phpBB/phpbb/install/controller/installer_index.php b/phpBB/phpbb/install/controller/installer_index.php index 8e1874984b..c2d9572284 100644 --- a/phpBB/phpbb/install/controller/installer_index.php +++ b/phpBB/phpbb/install/controller/installer_index.php @@ -53,6 +53,8 @@ class installer_index public function handle($mode) { + $this->helper->handle_language_select(); + switch ($mode) { case "intro": |