Merge pull request #16689 from nextcloud/backport/16686/stable16

rullzer · web-flow · commit fff47cdecbd5 · 2019-08-08T09:59:38.000+02:00
[stable16] Properly return an int in the getId function of the cache
diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php
@@ -416,7 +416,7 @@ public function getId($file) {
 		$sql = 'SELECT `fileid` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path_hash` = ?';
 		$result = $this->connection->executeQuery($sql, array($this->getNumericStorageId(), $pathHash));
 		if ($row = $result->fetch()) {
-			return $row['fileid'];
+			return (int)$row['fileid'];
 		} else {
 			return -1;
 		}

Original file line number	Diff line number	Diff line change
`@@ -416,7 +416,7 @@ public function getId($file) {`
`416`	`416`	$sql = 'SELECT `fileid` FROM `PREFIXfilecache` WHERE `storage` = ? AND `path_hash` = ?';
`417`	`417`	`$result = $this->connection->executeQuery($sql, array($this->getNumericStorageId(), $pathHash));`
`418`	`418`	`if ($row = $result->fetch()) {`
`419`		`- return $row['fileid'];`
	`419`	`+ return (int)$row['fileid'];`
`420`	`420`	`} else {`
`421`	`421`	`return -1;`
`422`	`422`	`}`