[Pkg-owncloud-commits] [owncloud-client] 169/470: Utility: Make sure to use UTC timestamp to compare in timeAgoInWords

[Sandro Knauß]

This is an automated email from the git hooks/post-receive script.

hefee-guest pushed a commit to branch master
in repository owncloud-client.

commit 41b43bf961bf933f53099ca09142bdc4f143c3e4
Author: Klaas Freitag <freitag at owncloud.com>
Date:   Fri Mar 18 08:29:21 2016 +0100

    Utility: Make sure to use UTC timestamp to compare in timeAgoInWords
    
    This should help to fix the problems we see in #4521
---
 src/libsync/utility.cpp | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/src/libsync/utility.cpp b/src/libsync/utility.cpp
index 85e42c4..07045b1 100644
--- a/src/libsync/utility.cpp
+++ b/src/libsync/utility.cpp
@@ -434,12 +434,14 @@ QByteArray Utility::versionOfInstalledBinary( const QString& command )
 
 QString Utility::timeAgoInWords(const QDateTime& dt, const QDateTime& from)
 {
-    QDateTime now = QDateTime::currentDateTime();
+    QDateTime now = QDateTime::currentDateTimeUtc();
 
     if( from.isValid() ) {
         now = from;
     }
 
+    Q_ASSERT(dt.timeSpec() == Qt::UTC);
+
     if( dt.daysTo(now)>0 ) {
         int dtn = dt.daysTo(now);
         return QObject::tr("%1 day(s) ago", "", dtn).arg(dtn);

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-owncloud/owncloud-client.git