From 79bafcd6abcbe17dad9247d1d34a7aebfbb8263e Mon Sep 17 00:00:00 2001
From: Flavio Copes <copesc@gmail.com>
Date: Wed, 19 Aug 2015 10:17:50 +0200
Subject: [PATCH] Correctly set the default language when not set in the user
 yaml (fixes language not changing problem)

---
 classes/admin.php | 4 +---
 1 file changed, 1 insertion(+), 3 deletions(-)

diff --git a/classes/admin.php b/classes/admin.php
index 3c4d768e..0e839b08 100644
--- a/classes/admin.php
+++ b/classes/admin.php
@@ -684,14 +684,12 @@ class Admin
         }
 
         if ($lookup) {
-            if (empty($languages)) {
+            if (empty($languages) || reset($languages) == null) {
                 if ($this->grav['config']->get('system.languages.translations_fallback', true)) {
                     $languages = $this->grav['language']->getFallbackLanguages();
                 } else {
                     $languages = (array)$this->grav['language']->getDefault();
                 }
-            } else {
-                $languages = ['en'];
             }
         } else {
             $languages = ['en'];