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/13740] Move handle_language_select calls to the controllers

Browse source 
PHPBB3-13740
This commit is contained in:
Mate Bartus 2015-07-26 22:20:32 +02:00
parent f7641cd506
commit 495c0c6fb3
3 changed files with 5 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
phpBB/phpbb/install/controller/helper.php
View file

@ -114,8 +114,6 @@ class helper
$this->router = $router; $this->router = $router;
$this->phpbb_root_path = $phpbb_root_path; $this->phpbb_root_path = $phpbb_root_path;
$this->phpbb_admin_path = $phpbb_root_path . 'adm/'; $this->phpbb_admin_path = $phpbb_root_path . 'adm/';
$this->handle_language_select();
} }
/** /**
@ -167,7 +165,7 @@ class helper
/** /**
* Handles language selector form * Handles language selector form
*/ */
protected function handle_language_select() public function handle_language_select()
{ {
$lang = null; $lang = null;

2
phpBB/phpbb/install/controller/install.php
View file

@ -176,6 +176,8 @@ class install
// Determine whether the installation was started or not // Determine whether the installation was started or not
if (true) if (true)
{ {
$this->controller_helper->handle_language_select();
// Set active stage // Set active stage
$this->menu_provider->set_nav_property( $this->menu_provider->set_nav_property(
array('install', 0, 'introduction'), array('install', 0, 'introduction'),

2
phpBB/phpbb/install/controller/installer_index.php
View file

@ -53,6 +53,8 @@ class installer_index
public function handle($mode) public function handle($mode)
{ {
$this->helper->handle_language_select();
switch ($mode) switch ($mode)
{ {
case "intro": case "intro":