better variable naming

remotes/origin/stable6
Robin Appelman 12 years ago
parent e1e7b6a940
commit 74c54587ec
  1. 6
      lib/files/cache/scanner.php

@ -75,10 +75,10 @@ class Scanner extends BasicEmitter {
*
* @param string $file
* @param int $reuseExisting
* @param bool $parentExists
* @param bool $parentExistsInCache
* @return array with metadata of the scanned file
*/
public function scanFile($file, $reuseExisting = 0, $parentExists = false) {
public function scanFile($file, $reuseExisting = 0, $parentExistsInCache = false) {
if (!self::isPartialFile($file)
and !Filesystem::isFileBlacklisted($file)
) {
@ -86,7 +86,7 @@ class Scanner extends BasicEmitter {
\OC_Hook::emit('\OC\Files\Cache\Scanner', 'scan_file', array('path' => $file, 'storage' => $this->storageId));
$data = $this->getData($file);
if ($data) {
if ($file and !$parentExists) {
if ($file and !$parentExistsInCache) {
$parent = dirname($file);
if ($parent === '.' or $parent === '/') {
$parent = '';

Loading…
Cancel
Save