mirror/php-phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-07-30 21:40:43 +02:00
Code Issues Releases Wiki Activity

[ticket/14460] Use the selected language with AJAX requests as well

Browse Source 
PHPBB3-14460
This commit is contained in:
Mate Bartus
2016-02-06 14:10:48 +01:00
parent df505d772d
commit 37705353c5
5 changed files with 13 additions and 18 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
phpBB/phpbb/install/helper/config.php
View File

@@ -227,18 +227,22 @@ class config
$file_content = @file_get_contents($this->install_config_file);
$serialized_data = trim(substr($file_content, 8));
$this->installer_config = array();
$this->progress_data = array();
$this->navigation_data = array();
$installer_config = array();
$progress_data = array();
$navigation_data = array();
if (!empty($serialized_data))
{
$unserialized_data = json_decode($serialized_data, true);
$this->installer_config = (is_array($unserialized_data['installer_config'])) ? $unserialized_data['installer_config'] : array();
$this->progress_data = (is_array($unserialized_data['progress_data'])) ? $unserialized_data['progress_data'] : array();
$this->navigation_data = (is_array($unserialized_data['navigation_data'])) ? $unserialized_data['navigation_data'] : array();
$installer_config = (is_array($unserialized_data['installer_config'])) ? $unserialized_data['installer_config'] : array();
$progress_data = (is_array($unserialized_data['progress_data'])) ? $unserialized_data['progress_data'] : array();
$navigation_data = (is_array($unserialized_data['navigation_data'])) ? $unserialized_data['navigation_data'] : array();
}
$this->installer_config = array_merge($this->installer_config, $installer_config);
$this->progress_data = array_merge($this->progress_data, $progress_data);
$this->navigation_data = array_merge($this->navigation_data, $navigation_data);
}
/**

2
phpBB/phpbb/install/helper/iohandler/factory.php
View File

@@ -75,7 +75,5 @@ class factory
throw new iohandler_not_implemented_exception();
break;
}
throw new iohandler_not_implemented_exception();
}
}