Check if data variable in scanner isn't null before using it
This commit is contained in:
parent
709aacfa0f
commit
cc5d8e5609
|
@ -70,6 +70,7 @@ class Scanner {
|
|||
public function scanFile($file) {
|
||||
\OC_Hook::emit('\OC\Files\Cache\Scanner', 'scan_file', array('path' => $file, 'storage' => $this->storageId));
|
||||
$data = $this->getData($file);
|
||||
if ($data) {
|
||||
if ($file !== '') {
|
||||
$parent = dirname($file);
|
||||
if ($parent === '.') {
|
||||
|
@ -81,6 +82,7 @@ class Scanner {
|
|||
}
|
||||
$id = $this->cache->put($file, $data);
|
||||
$this->permissionsCache->set($id, \OC_User::getUser(), $data['permissions']);
|
||||
}
|
||||
return $data;
|
||||
}
|
||||
|
||||
|
@ -101,6 +103,7 @@ class Scanner {
|
|||
if ($file !== '.' and $file !== '..') {
|
||||
$child = ($path !== '') ? $path . '/' . $file : $file;
|
||||
$data = $this->scanFile($child);
|
||||
if ($data) {
|
||||
if ($data['mimetype'] === 'httpd/unix-directory') {
|
||||
if ($recursive === self::SCAN_RECURSIVE) {
|
||||
$data['size'] = $this->scan($child, self::SCAN_RECURSIVE);
|
||||
|
@ -115,6 +118,7 @@ class Scanner {
|
|||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
if ($size !== -1) {
|
||||
$this->cache->put($path, array('size' => $size));
|
||||
}
|
||||
|
|
Loading…
Reference in New Issue