use strtotime on non-nummeric times in oc_filesystem::touch

2012-10-23 16:34:58 +02:00 · 2012-10-23 16:34:58 +02:00 · 7fdbce6ac1
parent ab944094e2
commit 7fdbce6ac1
1 changed files with 3 additions and 0 deletions
--- 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) {