[Pkg-owncloud-commits] [owncloud] 03/52: Use the Doctrine to convert date string to DateTime object.

[David Prévot]

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

taffit pushed a commit to branch master
in repository owncloud.

commit 3bbaba1ecae1f5322fcc594d40d707edadc95446
Author: Andreas Fischer <bantu at owncloud.com>
Date:   Tue Nov 26 12:21:31 2013 +0100

    Use the Doctrine to convert date string to DateTime object.
---
 lib/public/share.php | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/lib/public/share.php b/lib/public/share.php
index 708adba..86b6cfa 100644
--- a/lib/public/share.php
+++ b/lib/public/share.php
@@ -844,7 +844,8 @@ class Share {
 	protected static function expireItem(array $item) {
 		if (!empty($item['expiration'])) {
 			$now = new \DateTime();
-			$expirationDate = new \DateTime($item['expiration'], new \DateTimeZone('UTC'));
+			$expirationDate = \Doctrine\DBAL\Types\Type::getType('datetime')
+				->convertToPhpValue($item['expiration'], \OC_DB::getConnection()->getDatabasePlatform());
 			if ($now > $expirationDate) {
 				self::unshareItem($item);
 				return true;

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