PHP error if no display setting change had ever been made

This commit is contained in:
Squidly271 2022-03-14 09:23:46 -04:00
parent 85109564c8
commit 83e203f1ce
3 changed files with 2 additions and 2 deletions

Binary file not shown.

View File

@ -21,4 +21,4 @@ da3b4f9b73c5c3bf65be6c42d68b51f9 ./scripts/showStatistics.php
34554a56611dfe625889c82afd5138de ./scripts/updatePluginSupport.php 34554a56611dfe625889c82afd5138de ./scripts/updatePluginSupport.php
62494acd8ae889cf55688a22852eadb0 ./skins/Narrow/css.php 62494acd8ae889cf55688a22852eadb0 ./skins/Narrow/css.php
639c5146c5880a617fe15f603b1cffa3 ./skins/Narrow/skin.html 639c5146c5880a617fe15f603b1cffa3 ./skins/Narrow/skin.html
854e2ac5ff0f25fb454eaf6f4df38766 ./skins/Narrow/skin.php bad051dd5f42bd1183cfb9446caca35c ./skins/Narrow/skin.php

View File

@ -214,7 +214,7 @@ function my_display_apps($file,$pageNumber=1,$selectedApps=false,$startup=false)
} }
if ( $template['Language'] ) { if ( $template['Language'] ) {
$countryCode = $template['LanguageDefault'] ? "en_US" : $template['LanguagePack']; $countryCode = $template['LanguageDefault'] ? "en_US" : $template['LanguagePack'];
$dynamixSettings = parse_ini_file($caPaths['dynamixSettings'],true); $dynamixSettings = @parse_ini_file($caPaths['dynamixSettings'],true);
$currentLanguage = $dynamixSettings['display']['locale'] ?: "en_US"; $currentLanguage = $dynamixSettings['display']['locale'] ?: "en_US";
$installedLanguages = array_diff(scandir("/usr/local/emhttp/languages"),array(".","..")); $installedLanguages = array_diff(scandir("/usr/local/emhttp/languages"),array(".",".."));
$installedLanguages = array_filter($installedLanguages,function($v) { $installedLanguages = array_filter($installedLanguages,function($v) {