From 1bb97fdea957f1f12235ba5f5d0f8cdcfeb764ab Mon Sep 17 00:00:00 2001
From: Andy Miller <rhuk@mac.com>
Date: Thu, 2 Jun 2016 16:50:14 -0600
Subject: [PATCH] Simply fall back to `en` if no admin language set. - #641

---
 CHANGELOG.md      | 6 ++++++
 classes/admin.php | 2 +-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 079c3b83..00c26a3f 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,3 +1,9 @@
+# v1.1.0-rc.3
+## xx/xx/2016
+
+1. [](#bugfix)
+    * Fall back to english for UI language if admin's language is not set [#641](https://github.com/getgrav/grav-plugin-admin/issues/641)
+
 # v1.1.0-rc.2
 ## 06/02/2016
 
diff --git a/classes/admin.php b/classes/admin.php
index d9c012c1..21293cf7 100644
--- a/classes/admin.php
+++ b/classes/admin.php
@@ -953,7 +953,7 @@ class Admin
         }
 
         if (!$languages) {
-            $languages = [$this->grav['user']->authenticated ? $this->grav['user']->language : ($this->grav['language']->getLanguage() ?: 'en')];
+            $languages = [$this->grav['user']->authenticated ? $this->grav['user']->language : 'en'];
         } else {
             $languages = (array) $languages;
         }