diff --git a/application/libraries/Paths.php b/application/libraries/Paths.php index 1b86af470..8a16fd795 100644 --- a/application/libraries/Paths.php +++ b/application/libraries/Paths.php @@ -37,11 +37,6 @@ class Paths // make sure $filepath starts with a slash if (substr($filepath, 0, 1) !== '/') $filepath = '/' . $filepath; - // These files are not existent on purpose and should not trigger error logs - $err_exceptions = [ - '/assets/json/datatables_languages/en-US.json', - ]; - $CI = & get_instance(); $fullpath = empty($CI->config->item('directory')) ? $_SERVER['DOCUMENT_ROOT'] . $filepath : $_SERVER['DOCUMENT_ROOT'] . '/' . $CI->config->item('directory') . $filepath; @@ -52,9 +47,7 @@ class Paths if (file_exists($fullpath)) { return base_url($filepath) . '?v=' . filemtime($fullpath); } else { - if (!in_array($filepath, $err_exceptions)) { - log_message('error', 'CACHE BUSTER: File does not exist: ' . $fullpath); - } + log_message('error', 'CACHE BUSTER: File does not exist: ' . $fullpath); } return base_url($filepath); } diff --git a/application/views/interface_assets/footer.php b/application/views/interface_assets/footer.php index 04ab444aa..c187cab35 100644 --- a/application/views/interface_assets/footer.php +++ b/application/views/interface_assets/footer.php @@ -180,32 +180,27 @@ paths->cache_buster('/assets/json/datatables_languages/' . $local_code . '.json'); +$lang_code = $language['code']; -// Check if the file exists -if ($lang_code != 'en' && !file_exists(FCPATH . "assets/json/datatables_languages/" . $local_code . ".json")) { - $datatables_language_url = ''; -} else { - $datatables_language_url = $file_path; +$datatables_language_url = ''; +if ($lang_code !== 'en' && file_exists(FCPATH . "assets/json/datatables_languages/" . $local_code . ".json")) { + $datatables_language_url = $this->paths->cache_buster('/assets/json/datatables_languages/' . $local_code . '.json'); } ?> - diff --git a/application/views/visitor/layout/footer.php b/application/views/visitor/layout/footer.php index 24e722d67..8f76b2778 100644 --- a/application/views/visitor/layout/footer.php +++ b/application/views/visitor/layout/footer.php @@ -27,32 +27,27 @@ paths->cache_buster('/assets/json/datatables_languages/' . $local_code . '.json'); +$lang_code = $language['code']; -// Check if the file exists -if ($lang_code != 'en' && !file_exists(FCPATH . "assets/json/datatables_languages/" . $local_code . ".json")) { - $datatables_language_url = ''; -} else { - $datatables_language_url = $file_path; +$datatables_language_url = ''; +if ($lang_code !== 'en' && file_exists(FCPATH . "assets/json/datatables_languages/" . $local_code . ".json")) { + $datatables_language_url = $this->paths->cache_buster('/assets/json/datatables_languages/' . $local_code . '.json'); } ?> -