[stable10] Revert server side part of #12639

owncloud · Aug 15, 2017 · c763d19 · c763d19
1 parent c5f550e
commit c763d19
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 12 deletions.
diff --git a/apps/dav/tests/unit/Connector/Sabre/FileTest.php b/apps/dav/tests/unit/Connector/Sabre/FileTest.php
@@ -349,15 +349,6 @@ public function testPutSingleFile() {
 		$this->assertNotEmpty($this->doPut('/foo.txt'));
 	}
 
-	/**
-	 * Determine if the underlying storage supports a negative mtime value
-	 *
-	 * @return boolean true if negative mtime is supported
-	 */
-	private function supportsNegativeMtime() {
-		return !(getenv("RUN_OBJECTSTORE_TESTS") !== false);
-	}
-
 	public function legalMtimeProvider() {
 		return [
 			"string" => [
@@ -402,11 +393,11 @@ public function legalMtimeProvider() {
 			],
 			"negative int" => [
 					'HTTP_X_OC_MTIME' => -34,
-					'expected result' => ($this->supportsNegativeMtime() ? -34 : 0)
+					'expected result' => -34
 			],
 			"negative float" => [
 					'HTTP_X_OC_MTIME' => -34.43,
-					'expected result' => ($this->supportsNegativeMtime() ? -34 : 0)
+					'expected result' => -34
 			],
 		];
 	}

diff --git a/lib/private/Files/Storage/Common.php b/lib/private/Files/Storage/Common.php
@@ -170,7 +170,7 @@ public function getPermissions($path) {
 
 	public function filemtime($path) {
 		$stat = $this->stat($path);
-		if (isset($stat['mtime']) && $stat['mtime'] > 0) {
+		if (isset($stat['mtime'])) {
 			return $stat['mtime'];
 		} else {
 			return 0;