diff options
| author | Florin Peter <github@florin-peter.de> | 2013-05-25 20:37:28 +0200 |
|---|---|---|
| committer | Florin Peter <github@florin-peter.de> | 2013-05-25 20:37:28 +0200 |
| commit | adcafbde34b8f4c75dbf724e929766a1f7d964d4 (patch) | |
| tree | 993d117c7f7e9773eca8e445c63475c9ef207081 /lib/files | |
| parent | 4eddef1556ac7ee7fc0c7e82279672c52d9b6db9 (diff) | |
| parent | dbb6a10364fb87989cb13f704887782a1531e16b (diff) | |
| download | nextcloud-server-adcafbde34b8f4c75dbf724e929766a1f7d964d4.tar.gz nextcloud-server-adcafbde34b8f4c75dbf724e929766a1f7d964d4.zip | |
Merge branch 'master' into fix_for_2377
Diffstat (limited to 'lib/files')
| -rw-r--r-- | lib/files/cache/cache.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/files/cache/cache.php b/lib/files/cache/cache.php index 1e93cc59c6b..cae2e63e4dc 100644 --- a/lib/files/cache/cache.php +++ b/lib/files/cache/cache.php @@ -364,8 +364,8 @@ class Cache { if ($sourceData['mimetype'] === 'httpd/unix-directory') { //find all child entries - $query = \OC_DB::prepare('SELECT `path`, `fileid` FROM `*PREFIX*filecache` WHERE `path` LIKE ?'); - $result = $query->execute(array($source . '/%')); + $query = \OC_DB::prepare('SELECT `path`, `fileid` FROM `*PREFIX*filecache` WHERE `storage` = ? AND `path` LIKE ?'); + $result = $query->execute(array($this->getNumericStorageId(), $source . '/%')); $childEntries = $result->fetchAll(); $sourceLength = strlen($source); $query = \OC_DB::prepare('UPDATE `*PREFIX*filecache` SET `path` = ?, `path_hash` = ? WHERE `fileid` = ?'); |