makary/phpbb
1
0
Fork 0
mirror of https://github.com/phpbb/phpbb.git synced 2025-06-10 21:38:54 +00:00
Code Issues Projects Releases Packages Wiki Activity

[ticket/11574] Only fall back to install/update versions, when IN_INSTALL ;)

Browse source 
PHPBB3-11574
This commit is contained in:
Joas Schilling 2013-07-06 19:35:42 +02:00
parent fe7823b668
commit 3bccd10ccd
2 changed files with 6 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
phpBB/includes/di/extension/core.php
View file

@ -51,7 +51,8 @@ class phpbb_di_extension_core extends Extension
*/
public function load(array $config, ContainerBuilder $container)
{
if (file_exists($this->root_path . 'install/update/new/config/services.yml'))
// If we are in install, try to use the updated version, when available
if (defined('IN_INSTALL') && file_exists($this->root_path . 'install/update/new/config/services.yml'))
{
$loader = new YamlFileLoader($container, new FileLocator(phpbb_realpath($this->root_path . 'install/update/new/config')));
$loader->load('services.yml');

7
phpBB/includes/user.php
View file

@ -590,14 +590,15 @@ class phpbb_user extends phpbb_session
$language_filename = $lang_path . $this->lang_name . '/' . $filename . '.' . $phpEx;
}
if (!file_exists($language_filename))
if (defined('IN_INSTALL'))
{
// File was not found, try to find it in update directory
// If we are in install, try to use the updated version, when available
$orig_language_filename = $language_filename;
$language_filename = str_replace('language/', 'install/update/new/language/', $language_filename);
if (!file_exists($language_filename))
{
// Not found either, go back to the original file name
// Not found, go back to the original file name
$language_filename = $orig_language_filename;
}
}