Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3

Conflicts:
	cake/libs/folder.php
This commit is contained in:
Mark Story 2010-01-25 11:20:05 -05:00
commit 59319b098b

View file

@ -258,7 +258,7 @@ class Folder extends Object {
* @static
*/
function isWindowsPath($path) {
return (bool) preg_match('/^[A-Z]:\\\\/i', $path);
return (bool)preg_match('/^[A-Z]:\\\\/i', $path);
}
/**
@ -356,7 +356,7 @@ class Folder extends Object {
} else {
$return = preg_match('/^(.*)' . preg_quote($current, '/') . '(.*)/', $dir);
}
return (bool) $return;
return (bool)$return;
}
/**