mirror of
https://github.com/kamilwylegala/cakephp2-php8.git
synced 2024-11-15 11:28:25 +00:00
Merge branch '1.3' of github.com:cakephp/cakephp1x into 1.3
Conflicts: cake/libs/folder.php
This commit is contained in:
commit
59319b098b
1 changed files with 2 additions and 2 deletions
|
@ -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;
|
||||
}
|
||||
|
||||
/**
|
||||
|
|
Loading…
Reference in a new issue