From cd8cc15905c40f6550458ed67269f856aa6676d2 Mon Sep 17 00:00:00 2001 From: Merci Jacob <68013195+jacob-js@users.noreply.github.com> Date: Tue, 29 Oct 2024 13:52:35 +0200 Subject: [PATCH] Remove the duplicate of cash.min.js and fix js libs exclusion (#1305) --- lib/js_libs.php | 4 ++-- scripts/config_gen.php | 1 - 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/lib/js_libs.php b/lib/js_libs.php index eb0b0a476..f80b63c25 100644 --- a/lib/js_libs.php +++ b/lib/js_libs.php @@ -23,8 +23,8 @@ function get_js_libs($exclude_deps = []) { function get_js_libs_content($exclude_deps = []) { $js_lib = ''; - foreach (JS_LIBS as $dep) { - if (!in_array($dep, $exclude_deps)) { + foreach (JS_LIBS as $key => $dep) { + if (!in_array($key, $exclude_deps)) { $js_lib .= file_get_contents(APP_PATH.$dep); } } diff --git a/scripts/config_gen.php b/scripts/config_gen.php index 13b07f279..059acd8d2 100644 --- a/scripts/config_gen.php +++ b/scripts/config_gen.php @@ -263,7 +263,6 @@ function combine_includes($js, $js_compress, $css, $css_compress, $settings) { if ($js) { $mods = get_modules($settings); $js_lib = get_js_libs_content(explode(',', $settings['js_exclude_deps'])); - $js_lib .= file_get_contents("third_party/cash.min.js"); if (in_array('desktop_notifications', $mods, true)) { $js_lib .= file_get_contents("third_party/push.min.js"); }