From d8b9f6ac2338e25d9560174ae4be98b6adf19819 Mon Sep 17 00:00:00 2001
From: Joas Schilling <nickvergessen@owncloud.com>
Date: Tue, 23 Jun 2015 15:07:07 +0200
Subject: Use logtimezone and logdateformat

---
 core/command/upgrade.php | 7 +++++--
 1 file changed, 5 insertions(+), 2 deletions(-)

(limited to 'core')

diff --git a/core/command/upgrade.php b/core/command/upgrade.php
index de65d6176e8..8bdcd3fd6c2 100644
--- a/core/command/upgrade.php
+++ b/core/command/upgrade.php
@@ -232,8 +232,11 @@ class Upgrade extends Command {
 	protected function writeln(OutputInterface $output, $line) {
 		$t = '';
 		if($this->showTimestamp) {
-			$time = new \DateTime();
-			$t = $time->format(\DateTime::ISO8601) . ' ';
+			$timeZone = $this->config->getSystemValue('logtimezone', null);
+			$timeZone = $timeZone !== null ? new \DateTimeZone($timeZone) : null;
+
+			$time = new \DateTime('now', $timeZone);
+			$t = $time->format($this->config->getSystemValue('logdateformat', 'c')) . ' ';
 		}
 		$output->writeln($t . $line);
 	}
-- 
cgit v1.2.3