mikuli.cz

commit 119d173abe3909837463e9c91e3cd9e3d9e0c2ff
parent 168b285ea634845e899854f81ff45a4f62d61524
Author: markseu <mark2011@mayberg.se>
Date:   Mon, 15 Aug 2016 12:07:49 +0200

System update (summer remix)

Diffstat:
M
system/plugins/core.php
 | 
16
++++++++++------

1 file changed, 10 insertions(+), 6 deletions(-)
diff --git a/system/plugins/core.php b/system/plugins/core.php
@@ -2299,15 +2299,19 @@ class YellowLookup
 		$tokens = explode('/', $fileName);
 		for($i=0; $i<count($tokens)-1; ++$i)
 		{
-			if(!is_dir($path.$tokens[$i]) && !preg_match("/^[\d\-\_\.]+(.*)$/", $tokens[$i]))
+			if(!is_dir($path.$tokens[$i]))
 			{
-				$number = 1;
-				foreach($this->yellow->toolbox->getDirectoryEntries($path, "/^[\d\-\_\.]+(.*)$/", true, true, false) as $entry)
+				if(!preg_match("/^[\d\-\_\.]+(.*)$/", $tokens[$i]))
 				{
-					if($number!=1 && $number!=intval($entry)) break;
-					$number = intval($entry)+1;
+					$number = 1;
+					foreach($this->yellow->toolbox->getDirectoryEntries($path, "/^[\d\-\_\.]+(.*)$/", true, true, false) as $entry)
+					{
+						if($number!=1 && $number!=intval($entry)) break;
+						$number = intval($entry)+1;
+					}
+					$tokens[$i] = (empty($prefix) ? "$number-" : $prefix).$tokens[$i];
 				}
-				$tokens[$i] = (empty($prefix) ? "$number-" : $prefix).$tokens[$i];
+				$tokens[$i] = $this->normaliseName($tokens[$i], false, false, true);
 			}
 			$path .= $tokens[$i]."/";
 		}