diff options
| author | Dhruv <dhruv.goel92@gmail.com> | 2013-08-08 13:56:39 +0530 |
|---|---|---|
| committer | Dhruv <dhruv.goel92@gmail.com> | 2013-08-08 13:56:39 +0530 |
| commit | f35d732f40181a033e5ecd4e48fc846a82a73955 (patch) | |
| tree | 7ca90c3fbe3a7702584f3c105745e58b275eebc4 /phpBB/phpbb/user.php | |
| parent | 08a6bd2218e050ef2e82e644416a725b2a6cca99 (diff) | |
| parent | 32499c8808bb72812f66ba00e35c5af128a4d4e2 (diff) | |
| download | forums-f35d732f40181a033e5ecd4e48fc846a82a73955.tar forums-f35d732f40181a033e5ecd4e48fc846a82a73955.tar.gz forums-f35d732f40181a033e5ecd4e48fc846a82a73955.tar.bz2 forums-f35d732f40181a033e5ecd4e48fc846a82a73955.tar.xz forums-f35d732f40181a033e5ecd4e48fc846a82a73955.zip | |
Merge remote-tracking branch 'nickvergessen/ticket/11574' into develop
# By Joas Schilling (16) and Igor Wiedler (6)
# Via Joas Schilling (5) and Igor Wiedler (2)
* nickvergessen/ticket/11574: (22 commits)
[ticket/11574] Remove install/udpate/new/ fallback from database_update.php
[ticket/11574] Do not display incompatible package note after successful update
[ticket/11574] Remove old "continue step"-message
[ticket/11574] Change order of files and database update
[ticket/11574] Fix more issues in the updater
[ticket/11574] Add trailing slash for consistency
[ticket/11574] Fix table prefix in database updater
[ticket/11574] Fix various path issues in the updater
[ticket/11574] Make install language filename less crazy
[ticket/11574] Use alternate DI config file for updater
[ticket/11574] Include normalizer so it loads form the correct directory
[ticket/11574] Only fall back to install/update versions, when IN_INSTALL ;)
[ticket/11574] Use log object instead of old function
[ticket/11574] Include vendor into update packages
[ticket/11574] Create phpbb_log object before using it.
[ticket/11574] Add correct language parameter to return links
[ticket/11574] Use request object rather then request_var function
[ticket/11574] Load new language files whenever possible
[ticket/11574] Require new files in install/index.php and add a class loader
[ticket/11574] Require new files in database_update.php and add a class loader
...
Diffstat (limited to 'phpBB/phpbb/user.php')
| -rw-r--r-- | phpBB/phpbb/user.php | 7 |
1 files changed, 7 insertions, 0 deletions
diff --git a/phpBB/phpbb/user.php b/phpBB/phpbb/user.php index 5530fe3f03..b39438e315 100644 --- a/phpBB/phpbb/user.php +++ b/phpBB/phpbb/user.php @@ -590,6 +590,13 @@ class phpbb_user extends phpbb_session $language_filename = $lang_path . $this->lang_name . '/' . $filename . '.' . $phpEx; } + // If we are in install, try to use the updated version, when available + $install_language_filename = str_replace('language/', 'install/update/new/language/', $language_filename); + if (defined('IN_INSTALL') && file_exists($install_language_filename)) + { + $language_filename = $install_language_filename; + } + if (!file_exists($language_filename)) { global $config; |