summaryrefslogtreecommitdiffstats
path: root/inc/dictionary.inc.php
diff options
context:
space:
mode:
authorSimon Rettberg2018-03-28 10:33:08 +0200
committerSimon Rettberg2018-03-28 10:33:08 +0200
commit21d784d55adeefc63ed23d50fadedd1c463a166a (patch)
tree41c66e48e18bcc0bf03d1ced506fe376c1073645 /inc/dictionary.inc.php
parent[permissionmanager] fixed tree issue with deselecting parent-permissions (Tic... (diff)
parent[minilinux] permission 'show' => 'view' (diff)
downloadslx-admin-21d784d55adeefc63ed23d50fadedd1c463a166a.tar.gz
slx-admin-21d784d55adeefc63ed23d50fadedd1c463a166a.tar.xz
slx-admin-21d784d55adeefc63ed23d50fadedd1c463a166a.zip
Merge branch 'master' into permission-manager
Diffstat (limited to 'inc/dictionary.inc.php')
-rw-r--r--inc/dictionary.inc.php4
1 files changed, 4 insertions, 0 deletions
diff --git a/inc/dictionary.inc.php b/inc/dictionary.inc.php
index ee196f59..fcbfdfb8 100644
--- a/inc/dictionary.inc.php
+++ b/inc/dictionary.inc.php
@@ -17,6 +17,8 @@ class Dictionary
{
self::$languages = array();
foreach (glob('lang/??', GLOB_ONLYDIR) as $lang) {
+ if (!file_exists($lang . '/name.txt') && !file_exists($lang . '/flag.png'))
+ continue;
$lang = basename($lang);
if ($lang === '..')
continue;
@@ -191,6 +193,8 @@ class Dictionary
foreach (self::$languages as $lang) {
if (file_exists("lang/$lang/name.txt")) {
$name = file_get_contents("lang/$lang/name.txt");
+ } else {
+ $name = false;
}
if (!isset($name) || $name === false) {
$name = $lang;