From c13ed3366b7e4abbcbcf6b79127a180c87a342ac Mon Sep 17 00:00:00 2001 From: mark_story Date: Thu, 13 Sep 2012 21:05:10 -0400 Subject: [PATCH] Fix whitespace errors. --- lib/Cake/Utility/ClassRegistry.php | 2 +- lib/Cake/Utility/Folder.php | 6 +++--- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/lib/Cake/Utility/ClassRegistry.php b/lib/Cake/Utility/ClassRegistry.php index d5d52b5f7..b74f8b486 100644 --- a/lib/Cake/Utility/ClassRegistry.php +++ b/lib/Cake/Utility/ClassRegistry.php @@ -165,7 +165,7 @@ class ClassRegistry { $instance = $reflection->newInstance(); } if ($strict && !$instance instanceof Model) { - $instance = null; + $instance = null; } } if (!isset($instance)) { diff --git a/lib/Cake/Utility/Folder.php b/lib/Cake/Utility/Folder.php index 74c0d5b87..a5b2a9493 100644 --- a/lib/Cake/Utility/Folder.php +++ b/lib/Cake/Utility/Folder.php @@ -44,7 +44,7 @@ class Folder { * @constant SKIP */ const SKIP = 'skip'; - + /** * Path to Folder. * @@ -658,7 +658,7 @@ class Folder { while (($item = readdir($handle)) !== false) { $to = Folder::addPathElement($toDir, $item); if (($options['scheme'] != Folder::SKIP || !is_dir($to)) && !in_array($item, $exceptions)) { - $from = Folder::addPathElement($fromDir, $item); + $from = Folder::addPathElement($fromDir, $item); if (is_file($from)) { if (copy($from, $to)) { chmod($to, intval($mode, 8)); @@ -668,7 +668,7 @@ class Folder { $this->_errors[] = __d('cake_dev', '%s NOT copied to %s', $from, $to); } } - + if (is_dir($from) && file_exists($to) && $options['scheme'] == Folder::OVERWRITE) { $this->delete($to); }