Merge branch 'stable'

# Conflicts:
#	resources/vanilla
#	src/utils/Utils.php
This commit is contained in:
Dylan K. Taylor 2020-12-09 20:27:19 +00:00
commit ff6672ba85

View File

@ -96,7 +96,7 @@ final class Filesystem{
foreach($cleanPaths as $cleanPath => $replacement){
$cleanPath = rtrim(str_replace([DIRECTORY_SEPARATOR, "phar://"], ["/", ""], $cleanPath), "/");
if(strpos($result, $cleanPath) === 0){
$result = ltrim(str_replace($cleanPath, "[$replacement]", $result), "/");
$result = ltrim(str_replace($cleanPath, $replacement, $result), "/");
}
}
return $result;