[Pkg-owncloud-commits] [owncloud] 64/67: use strtotime on non-nummeric times in oc_filesystem::touch

[David Prévot]

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

taffit pushed a commit to annotated tag v4.5.1
in repository owncloud.

commit 1791fbdc49041f9579de38ed8d4bfa9142322144
Author: Robin Appelman <icewind at owncloud.com>
Date:   Tue Oct 23 16:34:58 2012 +0200

    use strtotime on non-nummeric times in oc_filesystem::touch
---
 lib/filesystemview.php |    3 +++
 1 file changed, 3 insertions(+)

diff --git a/lib/filesystemview.php b/lib/filesystemview.php
index 2950ced..776c859 100644
--- a/lib/filesystemview.php
+++ b/lib/filesystemview.php
@@ -251,6 +251,9 @@ class OC_FilesystemView {
 		return $this->basicOperation('filemtime', $path);
 	}
 	public function touch($path, $mtime=null) {
+		if(!is_null($mtime) and !is_numeric($mtime)){
+			$mtime = strtotime($mtime);
+		}
 		return $this->basicOperation('touch', $path, array('write'), $mtime);
 	}
 	public function file_get_contents($path) {

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