From b9b4a1e2b2c3fa33e8992853e2a19eae74984ecf Mon Sep 17 00:00:00 2001 From: Sam Minnee Date: Sat, 26 Apr 2008 06:51:18 +0000 Subject: [PATCH] Merged revisions 52398 via svnmerge from http://svn.silverstripe.com/open/modules/sapphire/branches/2.2.2 ........ r52398 | sminnee | 2008-04-09 18:19:30 +1200 (Wed, 09 Apr 2008) | 1 line Fix to ManifestBuilder when running site on windows in a directory containing \r or \t or \n ........ git-svn-id: svn://svn.silverstripe.com/silverstripe/open/modules/sapphire/trunk@53514 467b73ca-7a2a-4603-9d3b-597d59a354a9 --- core/ManifestBuilder.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/core/ManifestBuilder.php b/core/ManifestBuilder.php index 54d1b77aa..44dc0a036 100644 --- a/core/ManifestBuilder.php +++ b/core/ManifestBuilder.php @@ -87,6 +87,7 @@ class ManifestBuilder { // Config manifest $baseDir = dirname($_SERVER['SCRIPT_FILENAME']) . "/.."; $baseDir = ereg_replace("/[^/]+/\\.\\.", "", $baseDir); + $baseDir = preg_replace("/\\\\/", "/", $baseDir); $manifest = self::generate_php_file(self::get_manifest_info($baseDir)); @@ -557,6 +558,7 @@ class ManifestBuilder { // Config manifest $baseDir = dirname($_SERVER['SCRIPT_FILENAME']) . "/.."; $baseDir = ereg_replace("/[^/]+/\\.\\.","",$baseDir); + $baseDir = preg_replace("/\\\\/", "/", $baseDir); $topLevel = scandir($baseDir); foreach($topLevel as $filename) {