Infrastructure/Cloudreve
0
Fork 0
Code Issues Pull requests Activity

Merge branch 'master' of https://github.com/HFO4/Cloudreve

Browse source
This commit is contained in:
HFO4 2018-10-19 16:30:41 +08:00
commit 38b11c1651
2 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
application/index/model/Directory.php
View file

@ -168,7 +168,7 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota{
$dirName = end($explode);
$rootPath = rtrim($path,"/".$dirName);
$rootPath = empty($rootPath) ? "/" : $rootPath;
$dirData = Db::name('folders')->where('owner',$this->uid)->where('position',dirname($path) == "\\" ?"/":dirname($path))->where("folder_name",basename($path))->find();
$dirData = Db::name('folders')->where('owner',$this->uid)->where('position',dirname($path) == "\\" ?"/":dirname($path))->where("folder_name",getDirName($path))->find();
if(empty($dirData)){
return false;
}

6
composer.json
View file

@ -4,7 +4,7 @@
"keywords": ["php", "cloud", "ThinkPHP", "file-sharing"],
"homepage": "https://cloudreve.org",
"type": "project",
"license": "GPL-3.0-only",
"license": "GPL-3.0-only",
"authors": [
{
"name": "Aaron",
@ -35,8 +35,8 @@
"upyun/sdk": "^3.3"
},
"autoload": {
"psr-0": {
"CloudreveInstaller\\Installer" : ""
"psr-4": {
"CloudreveInstaller\\Installer\\" : ""
}
},
"scripts": {