Merge branch '2021.11' into 2022.11

tine20 · Mar 17, 2022 · 8d39bab · 8d39bab
2 parents 442cd1e + 4505b6b
commit 8d39bab
Showing 1 changed file with 11 additions and 6 deletions.
diff --git a/tine20/Tinebase/Frontend/Http.php b/tine20/Tinebase/Frontend/Http.php
@@ -428,23 +428,28 @@ protected function _getFilesToWatch($_fileType, $apps = array())
         $filesToWatch = array();
 
         foreach ($orderedApplications as $application) {
-            if (! empty($apps) && $apps[0] != 'all' && ! in_array($application, $apps)) continue;
-            switch($_fileType) {
+            if (! empty($apps) && $apps[0] != 'all' && ! in_array($application, $apps)) {
+                continue;
+            }
+            switch ($_fileType) {
                 case 'js':
                     $filesToWatch[] = "{$application}/js/{$application}";
                     break;
                 case 'lang':
-                    $fileName = "{$application}/js/{$application}-lang-" . Tinebase_Core::getLocale() . (TINE20_BUILDTYPE == 'DEBUG' ? '-debug' : null) . '.js';
+                    $fileName = "{$application}/js/{$application}-lang-" . Tinebase_Core::getLocale()
+                        . (TINE20_BUILDTYPE == 'DEBUG' ? '-debug' : null) . '.js';
                     $lang = Tinebase_Core::getLocale();
                     $customPath = Tinebase_Config::getInstance()->translations;
-                    $basePath = is_readable("$customPath/$lang/$fileName") ?  "$customPath/$lang" : '.';
+                    $basePath = ! empty($customPath) && is_readable("$customPath/$lang/$fileName")
+                        ? "$customPath/$lang"
+                        : '.';
 
-                    $langFile = "{$basePath}/{$application}/js/{$application}-lang-" . Tinebase_Core::getLocale() . (TINE20_BUILDTYPE == 'DEBUG' ? '-debug' : null) . '.js';
+                    $langFile = "{$basePath}/{$application}/js/{$application}-lang-" . Tinebase_Core::getLocale()
+                        . (TINE20_BUILDTYPE == 'DEBUG' ? '-debug' : null) . '.js';
                     $filesToWatch[] = $langFile;
                     break;
                 default:
                     throw new Exception('no such fileType');
-                    break;
             }
         }