michael/webmin
1
0
Fork 0
mirror of https://github.com/webmin/webmin.git synced 2026-02-03 06:03:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix to change version in caller

Browse Source
This commit is contained in:
Ilia Ross
2023-10-10 23:36:52 +03:00
parent ba1aa5a498
commit d7de842f45
2 changed files with 3 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
ui-lib.pl
View File

@@ -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 = "<script>const __webmin_webprefix__ = '@{[&get_webprefix()]}';</script>\n";
$switch_script .= "<script type=\"text/javascript\" src=\"@{[&get_webprefix()]}/unauthenticated/switch_theme.js?@{[&get_webmin_version(1)]}\"></script>\n";
my $webmin_version = &get_webmin_version();
$webmin_version =~ s/\.//g;
$switch_script .= "<script type=\"text/javascript\" src=\"@{[&get_webprefix()]}/unauthenticated/switch_theme.js?$webmin_version\"></script>\n";
return $switch_script;
}

6
web-lib-funcs.pl
View File

@@ -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;
}