[Pkg-owncloud-commits] [owncloud] 68/121: Cast file id's to int so we can compare them properly

David Prévot taffit at moszumanska.debian.org
Thu Aug 21 16:44:34 UTC 2014


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

taffit pushed a commit to branch master
in repository owncloud.

commit e2f23b24f7d1213bd37b75d9386cea6f2a0a264a
Author: Robin Appelman <icewind at owncloud.com>
Date:   Wed Aug 13 18:06:28 2014 +0200

    Cast file id's to int so we can compare them properly
---
 apps/files_sharing/lib/sharedstorage.php | 4 ++--
 lib/private/files/view.php               | 1 +
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/apps/files_sharing/lib/sharedstorage.php b/apps/files_sharing/lib/sharedstorage.php
index 8d5b22d..02fcd70 100644
--- a/apps/files_sharing/lib/sharedstorage.php
+++ b/apps/files_sharing/lib/sharedstorage.php
@@ -48,10 +48,10 @@ class Shared extends \OC\Files\Storage\Common implements ISharedStorage {
 
 	/**
 	 * get file cache of the shared item source
-	 * @return string
+	 * @return int
 	 */
 	public function getSourceId() {
-		return $this->share['file_source'];
+		return (int) $this->share['file_source'];
 	}
 
 	/**
diff --git a/lib/private/files/view.php b/lib/private/files/view.php
index 11c25f8..44e44ad 100644
--- a/lib/private/files/view.php
+++ b/lib/private/files/view.php
@@ -1179,6 +1179,7 @@ class View {
 	 * @return string|null
 	 */
 	public function getPath($id) {
+		$id = (int) $id;
 		$manager = Filesystem::getMountManager();
 		$mounts = $manager->findIn($this->fakeRoot);
 		$mounts[] = $manager->find($this->fakeRoot);

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



More information about the Pkg-owncloud-commits mailing list