summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGreg Roach <fisharebest@gmail.com>2017-07-17 16:43:57 +0100
committerGreg Roach <fisharebest@gmail.com>2017-07-17 17:19:08 +0100
commitcbf1be5da4a9f59b83c99d6fe741397a73c71005 (patch)
tree919eaef9387e045caf1d5b28f9eae08b74ed6be0
parentce6cdd02b21bbd17b864da910472f6b5e3b7ffef (diff)
downloadwebtrees-cbf1be5da4a9f59b83c99d6fe741397a73c71005.tar.gz
webtrees-cbf1be5da4a9f59b83c99d6fe741397a73c71005.tar.bz2
webtrees-cbf1be5da4a9f59b83c99d6fe741397a73c71005.zip
Fix #1262 Deleting a .MO file while it is being used causes error
-rw-r--r--app/I18N.php2
1 files changed, 1 insertions, 1 deletions
diff --git a/app/I18N.php b/app/I18N.php
index 9d33eea6c1..285f93d12a 100644
--- a/app/I18N.php
+++ b/app/I18N.php
@@ -314,7 +314,7 @@ class I18N {
} else {
// Negotiate a locale, but if we can't then use a failsafe
self::$locale = new LocaleEnUs;
- if (Session::has('locale')) {
+ if (Session::has('locale') && file_exists(WT_ROOT . 'language/' . Session::get('locale') . '.mo')) {
// Previously used
self::$locale = Locale::create(Session::get('locale'));
} else {