fix duplicates showing up in the filecache
This commit is contained in:
parent
1c0e72cd5a
commit
f1e4c845ce
|
@ -86,7 +86,7 @@ class OC_FileCache{
|
||||||
}
|
}
|
||||||
$path=$root.$path;
|
$path=$root.$path;
|
||||||
$parent=self::getParentId($path);
|
$parent=self::getParentId($path);
|
||||||
$id=self::getId($path,'');
|
$id=self::getFileId($path);
|
||||||
if(isset(OC_FileCache::$savedData[$path])){
|
if(isset(OC_FileCache::$savedData[$path])){
|
||||||
$data=array_merge(OC_FileCache::$savedData[$path],$data);
|
$data=array_merge(OC_FileCache::$savedData[$path],$data);
|
||||||
unset(OC_FileCache::$savedData[$path]);
|
unset(OC_FileCache::$savedData[$path]);
|
||||||
|
@ -130,9 +130,11 @@ class OC_FileCache{
|
||||||
foreach(array('size','mtime','ctime','mimetype','encrypted','versioned','writable') as $attribute){
|
foreach(array('size','mtime','ctime','mimetype','encrypted','versioned','writable') as $attribute){
|
||||||
if(isset($data[$attribute])){
|
if(isset($data[$attribute])){
|
||||||
//Convert to int it args are false
|
//Convert to int it args are false
|
||||||
if($data[$attribute] === false) $arguments[] = 0;
|
if($data[$attribute] === false){
|
||||||
else $arguments[] = $data[$attribute];
|
$arguments[] = 0;
|
||||||
$arguments[]=$data[$attribute];
|
}else{
|
||||||
|
$arguments[] = $data[$attribute];
|
||||||
|
}
|
||||||
$queryParts[]=$attribute.'=?';
|
$queryParts[]=$attribute.'=?';
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue