diff options
| author | Robin Appelman <icewind@owncloud.com> | 2012-10-23 16:34:58 +0200 |
|---|---|---|
| committer | Robin Appelman <icewind@owncloud.com> | 2012-10-23 16:36:09 +0200 |
| commit | 7fdbce6ac164240b9486177ff0b6e880869e910f (patch) | |
| tree | 0e760f1f85a6573aed88698d1de707a443e2d80b /lib/filesystemview.php | |
| parent | ab944094e2c0c9d063cc363a81dbe517c259a466 (diff) | |
| download | nextcloud-server-7fdbce6ac164240b9486177ff0b6e880869e910f.tar.gz nextcloud-server-7fdbce6ac164240b9486177ff0b6e880869e910f.zip | |
use strtotime on non-nummeric times in oc_filesystem::touch
Diffstat (limited to 'lib/filesystemview.php')
| -rw-r--r-- | lib/filesystemview.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/filesystemview.php b/lib/filesystemview.php index 2950ced5f9e..776c859412f 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) { |