From a7a8f36381556d0231e52efde818c316c09cc3c4 Mon Sep 17 00:00:00 2001 From: Ilia Rostovtsev Date: Sat, 20 Nov 2021 18:44:30 +0300 Subject: [PATCH] Fix cache timestamp generation to support new two dot version format --- authentic-init.pl | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/authentic-init.pl b/authentic-init.pl index e1bd35ee7..54c2dbafb 100644 --- a/authentic-init.pl +++ b/authentic-init.pl @@ -1330,6 +1330,18 @@ sub theme_version my $is_rc = string_contains($version, 'RC'); my $is_devel_ver = $is_alpha || $is_beta || $is_rc; + # XXX refactor target - this sub should do only one thing not multiple + my $version_suf = $version; + my ($version_sim) = $version_suf =~ /([\d]+\.[\d]+)/; + if ($version_suf =~ /[\d]+\.[\d]+\.([\d]+)/) { + $version_suf = $1; + if ($version_suf <= 9) { + $version_suf = "0$version_suf"; + } + } else { + $version_suf = "00"; + } + # Return minor version only if ($minor) { @@ -1347,11 +1359,12 @@ sub theme_version # Return theme version as timestamp if ($string) { + $version = $version_sim; $version =~ s/(alpha|beta|RC)\d*|\.|-//ig; if (theme_debug_mode() || $is_devel_ver) { - $version .= ("9" . time() . "$mversion"); + $version .= $version_suf . ("9" . time() . "$mversion"); } else { - $version .= ('99999999999' . $mversion); + $version .= $version_suf . ('99999999999' . $mversion); } } return $version;