mikuli.cz

commit 80db30ad71f2fe47697b61cacf10dcacf4cb1aed
parent ae38c5749bdfd9cdf7a549dc270f2ea3855904ec
Author: markseu <mark2011@mayberg.se>
Date:   Fri, 17 Feb 2017 11:23:30 +0100

System update (for Ivo)

Diffstat:
M
system/plugins/update.php
 | 
12
+++++-------

1 file changed, 5 insertions(+), 7 deletions(-)
diff --git a/system/plugins/update.php b/system/plugins/update.php
@@ -260,17 +260,15 @@ class YellowUpdate
 		{
 			$pathsSource = $pathsTarget = array();
 			$pathBase = $this->yellow->config->get("contentDir");
-			$pathRoot = $this->yellow->config->get("contentRootDir");
 			$fileExtension = $this->yellow->config->get("contentExtension");
 			$fileRegex = "/^.*\\".$fileExtension."$/";
-			foreach($this->yellow->toolbox->getDirectoryEntries($pathBase, "/.*/", true, true, false) as $entry)
+			foreach($this->yellow->toolbox->getDirectoryEntries($pathBase, "/.*/", true, true) as $entry)
 			{
-				if($this->yellow->lookup->normaliseName($entry)."/"==$pathRoot) continue;
-				if(count($this->yellow->toolbox->getDirectoryEntries($pathBase.$entry, $fileRegex, true, false)))
+				if(count($this->yellow->toolbox->getDirectoryEntries($entry, $fileRegex, false, false)))
 				{
-					array_push($pathsSource, $pathBase.$entry."/");
-				} else {
-					array_push($pathsTarget, $pathBase.$entry."/");
+					array_push($pathsSource, $entry."/");
+				} else if(count($this->yellow->toolbox->getDirectoryEntries($entry, "/.*/", false, true))) {
+					array_push($pathsTarget, $entry."/");
 				}
 			}
 			if(count($pathsSource) && count($pathsTarget))