commit ff2ba72fc1de211a18ce4639dd1009f2345106b5
parent 7e9e1f97b62596ebc36f1cc7b3bdd373192b6385
Author: markseu <mark2011@mayberg.se>
Date: Wed, 7 Sep 2016 16:48:26 +0200
System update (for Niels)
Diffstat:
1 file changed, 6 insertions(+), 3 deletions(-)
diff --git a/system/plugins/core.php b/system/plugins/core.php
@@ -1514,7 +1514,10 @@ class YellowFiles
if($absoluteLocation) $location = substru($location, strlenu($this->yellow->page->base));
foreach($this->scanLocation($this->getParentLocation($location)) as $file)
{
- if($file->location==$location) { $found = true; break; }
+ if($file->location==$location)
+ {
+ if($this->yellow->lookup->isFileLocation($file->location)) { $found = true; break; }
+ }
}
return $found ? $file : null;
}
@@ -1539,7 +1542,7 @@ class YellowFiles
{
if($file->isAvailable() && ($file->isVisible() || $showInvisible))
{
- $files->append($file);
+ if($this->yellow->lookup->isFileLocation($file->location)) $files->append($file);
}
}
return $files;
@@ -1554,7 +1557,7 @@ class YellowFiles
{
if($file->isAvailable() && ($file->isVisible() || $showInvisible))
{
- $files->append($file);
+ if($this->yellow->lookup->isFileLocation($file->location)) $files->append($file);
if(!$this->yellow->lookup->isFileLocation($file->location) && $levelMax!=0)
{
$files->merge($this->getChildrenRecursive($file->location, $showInvisible, $levelMax));