Fix to test Perl version for make_date to support (still) CentOS 6

https://sourceforge.net/p/webadmin/bugs/5622/
This commit is contained in:
iliajie
2023-06-09 03:21:01 +03:00
parent 5fc5fea30a
commit ca5c75785d
7 changed files with 8 additions and 8 deletions
+1 -1
View File
@@ -207,7 +207,7 @@ if ($access{'lang'}) {
if ($access{'locale'}) {
# Current locale
eval "use DateTime; use DateTime::Locale; use DateTime::TimeZone;";
if (!$@) {
if (!$@ && $] > 5.011) {
my $locales = &list_locales();
my %localesrev = reverse %{$locales};
my $locale_auto = &parse_accepted_language();
+2 -2
View File
@@ -59,9 +59,9 @@ if ($access{'lang'}) {
# Old datetime format or a new locale
if ($access{'locale'}) {
eval "use DateTime; use DateTime::Locale; use DateTime::TimeZone;";
&foreign_require('webmin');
if (!$@) {
eval "use DateTime; use DateTime::Locale; use DateTime::TimeZone;";
if (!$@ && $] > 5.011) {
my $locales = &list_locales();
my %localesrev = reverse %{$locales};
my $locale = $locale_auto || $gconfig{'locale'} || &get_default_system_locale();
+1 -1
View File
@@ -1480,7 +1480,7 @@ if ($u) {
my $locale;
if ($userconfig{'date_fmt'} eq 'auto' || $config{'date_fmt'} eq 'auto') {
eval "use DateTime; use DateTime::Locale; use DateTime::TimeZone;";
if (!$@) {
if (!$@ && $] > 5.011) {
$locale++;
return &make_date($u, undef, $fmt);
}
+1 -1
View File
@@ -83,7 +83,7 @@ if (&show_section('host')) {
# System time
my $tm = localtime(time());
eval "use DateTime; use DateTime::Locale; use DateTime::TimeZone;";
if (!$@) {
if (!$@ && $] > 5.011) {
$tm = make_date(time(), {get => 'complete'});
}
if (&foreign_available("time")) {
+1 -1
View File
@@ -21,7 +21,7 @@ print &ui_table_row($text{'lang_lang'},
# Old datetime format or a new locale
eval "use DateTime; use DateTime::Locale; use DateTime::TimeZone;";
if (!$@) {
if (!$@ && $] > 5.011) {
my $locales = &list_locales();
my %localesrev = reverse %{$locales};
my $locale_auto = &parse_accepted_language(\%uconfig);
+1 -1
View File
@@ -1993,7 +1993,7 @@ sub make_date
my ($secs, $only, $fmt) = @_;
$secs ||= 0;
eval "use DateTime; use DateTime::Locale; use DateTime::TimeZone;";
if (!$@) {
if (!$@ && $] > 5.011) {
my $opts = ref($only) ? $only : {};
my $locale_default = &get_default_system_locale();
my $locale_auto = &parse_accepted_language();
+1 -1
View File
@@ -22,7 +22,7 @@ print &ui_table_row($text{'lang_lang'},
# Old datetime format or a new locale
eval "use DateTime; use DateTime::Locale; use DateTime::TimeZone;";
if (!$@) {
if (!$@ && $] > 5.011) {
my $locales = &list_locales();
my %localesrev = reverse %{$locales};
my $locale_auto = &parse_accepted_language();