From d7de842f450ff4c25f79e76d255965ecb7fdf474 Mon Sep 17 00:00:00 2001 From: Ilia Ross Date: Tue, 10 Oct 2023 23:36:52 +0300 Subject: [PATCH] Fix to change version in caller --- ui-lib.pl | 4 +++- web-lib-funcs.pl | 6 ------ 2 files changed, 3 insertions(+), 7 deletions(-) diff --git a/ui-lib.pl b/ui-lib.pl index e2fe3b27e..c8625fa1e 100755 --- a/ui-lib.pl +++ b/ui-lib.pl @@ -2301,7 +2301,9 @@ sub ui_switch_theme_javascript return &theme_ui_switch_theme_javascript(@_) if (defined(&theme_ui_switch_theme_javascript)); return "" if (!$gconfig{'debug_enabled'} && !$gconfig{'debug_theme_switcher'}); my $switch_script = "\n"; -$switch_script .= "\n"; +my $webmin_version = &get_webmin_version(); +$webmin_version =~ s/\.//g; +$switch_script .= "\n"; return $switch_script; } diff --git a/web-lib-funcs.pl b/web-lib-funcs.pl index d001d39a2..01f9e8519 100755 --- a/web-lib-funcs.pl +++ b/web-lib-funcs.pl @@ -4450,16 +4450,10 @@ Returns the version of Webmin currently being run, such as 1.450. =cut sub get_webmin_version { -my ($str) = @_; if (!$get_webmin_version) { $get_webmin_version = &read_file_contents("$root_directory/version"); $get_webmin_version =~ s/\r|\n//g; } -if ($str) { - my $get_webmin_version_str = $get_webmin_version; - $get_webmin_version_str =~ s/\.//g; - return $get_webmin_version_str; - } return $get_webmin_version; }