diff options
| author | Roeland Jago Douma <rullzer@users.noreply.github.com> | 2017-03-14 21:00:24 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2017-03-14 21:00:24 +0100 |
| commit | 67faf7edc4fc211a729d4c02c8907a8fe6483802 (patch) | |
| tree | 8a64c77138b79383ac1fa162cb3d86608b6ae650 | |
| parent | 562c45d925a27b21f694a091029d87158364970c (diff) | |
| parent | 210f4106c4442e2f7ac0ed9211961b52f75e6146 (diff) | |
| download | nextcloud-server-67faf7edc4fc211a729d4c02c8907a8fe6483802.tar.gz nextcloud-server-67faf7edc4fc211a729d4c02c8907a8fe6483802.zip | |
Merge pull request #3838 from Xuanwo/basename-fix
[OC/Files/Cache]: Fix wrong usage of basename
| -rw-r--r-- | lib/private/Files/Cache/Cache.php | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/private/Files/Cache/Cache.php b/lib/private/Files/Cache/Cache.php index 95a78f99829..9c3b786ae87 100644 --- a/lib/private/Files/Cache/Cache.php +++ b/lib/private/Files/Cache/Cache.php @@ -17,6 +17,7 @@ * @author TheSFReader <TheSFReader@gmail.com> * @author Thomas Müller <thomas.mueller@tmit.eu> * @author Vincent Petry <pvince81@owncloud.com> + * @author Xuanwo <xuanwo@yunify.com> * * @license AGPL-3.0 * @@ -532,7 +533,7 @@ class Cache implements ICache { $this->connection->executeQuery($moveSql, [$targetStorageId, $targetPath, md5($targetPath), basename($targetPath), $newParentId, $sourceId]); $this->connection->commit(); } else { - $this->connection->executeQuery($moveSql, [$targetStorageId, $targetPath, md5($targetPath), basename($targetPath), $newParentId, $sourceId]); + $this->connection->executeQuery($moveSql, [$targetStorageId, $targetPath, md5($targetPath), \OC_Util::basename($targetPath), $newParentId, $sourceId]); } } else { $this->moveFromCacheFallback($sourceCache, $sourcePath, $targetPath); |