Merge branch 'bareos-16.2'

bareos · Oct 14, 2016 · 5490787 · 5490787
2 parents 4eec21f + b29f30d
commit 5490787
Showing 1 changed file with 2 additions and 2 deletions.
diff --git a/module/Auth/src/Auth/Form/LoginForm.php b/module/Auth/src/Auth/Form/LoginForm.php
@@ -5,7 +5,7 @@
  * bareos-webui - Bareos Web-Frontend
  *
  * @link      https://github.com/bareos/bareos-webui for the canonical source repository
- * @copyright Copyright (c) 2013-2015 Bareos GmbH & Co. KG (http://www.bareos.org/)
+ * @copyright Copyright (c) 2013-2016 Bareos GmbH & Co. KG (http://www.bareos.org/)
  * @license   GNU Affero General Public License (http://www.gnu.org/licenses/)
  *
  * This program is free software: you can redistribute it and/or modify
@@ -243,7 +243,7 @@ private function determineLanguage($default = "en_EN") {
             $l['ru_RU'] = 'Russian';
             break;
          default:
-            $l = null;
+            $l['en_EN'] = 'English';
       }
 
       return $l;