aboutsummaryrefslogtreecommitdiffstats
path: root/Bugzilla
diff options
context:
space:
mode:
authorFrédéric Buclin <LpSolit@netscape.net>2017-08-04 01:44:50 +0200
committerFrédéric Buclin <LpSolit@netscape.net>2017-08-04 01:44:50 +0200
commit0e3e52ad51c412fae8c370a23fbfe1048b73ca71 (patch)
tree3781d57a1bca0e64e82d1bf12eedf356b3144d54 /Bugzilla
parent394462fb627313899fc786a49afec35bd7090427 (diff)
parent070e12173d34e6aeee95e1831f43974810951f0e (diff)
downloadbugs-0e3e52ad51c412fae8c370a23fbfe1048b73ca71.tar
bugs-0e3e52ad51c412fae8c370a23fbfe1048b73ca71.tar.gz
bugs-0e3e52ad51c412fae8c370a23fbfe1048b73ca71.tar.bz2
bugs-0e3e52ad51c412fae8c370a23fbfe1048b73ca71.tar.xz
bugs-0e3e52ad51c412fae8c370a23fbfe1048b73ca71.zip
Sync with upstream 5.0 branch
One single bugfix in the last 14 months since 5.0.3, not bad! :-D (everything else is cosmetic which does not affect Mageia Bugzilla)
Diffstat (limited to 'Bugzilla')
-rw-r--r--Bugzilla/DB/Sqlite.pm1
-rw-r--r--Bugzilla/Migrate.pm2
-rw-r--r--Bugzilla/Util.pm2
3 files changed, 3 insertions, 2 deletions
diff --git a/Bugzilla/DB/Sqlite.pm b/Bugzilla/DB/Sqlite.pm
index ddafc1696..a56ed31ad 100644
--- a/Bugzilla/DB/Sqlite.pm
+++ b/Bugzilla/DB/Sqlite.pm
@@ -219,6 +219,7 @@ sub sql_date_format {
my ($self, $date, $format) = @_;
$format = "%Y.%m.%d %H:%M:%S" if !$format;
$format =~ s/\%i/\%M/g;
+ $format =~ s/\%s/\%S/g;
return "STRFTIME(" . $self->quote($format) . ", $date)";
}
diff --git a/Bugzilla/Migrate.pm b/Bugzilla/Migrate.pm
index 0731d4fed..7865c842d 100644
--- a/Bugzilla/Migrate.pm
+++ b/Bugzilla/Migrate.pm
@@ -403,7 +403,7 @@ sub parse_date {
}
my $tz;
if ($time[6]) {
- $tz = Bugzilla->local_timezone->offset_as_string($time[6]);
+ $tz = DateTime::TimeZone->offset_as_string($time[6]);
}
else {
$tz = $self->config('timezone');
diff --git a/Bugzilla/Util.pm b/Bugzilla/Util.pm
index bbf4261ca..5fe64621b 100644
--- a/Bugzilla/Util.pm
+++ b/Bugzilla/Util.pm
@@ -588,7 +588,7 @@ sub datetime_from {
second => defined($time[0]) ? int($time[0]) : undef,
# If a timezone was specified, use it. Otherwise, use the
# local timezone.
- time_zone => Bugzilla->local_timezone->offset_as_string($time[6])
+ time_zone => DateTime::TimeZone->offset_as_string($time[6])
|| Bugzilla->local_timezone,
);