Skip to content
Permalink
Browse files

Fix whitespace errors.

  • Loading branch information...
markstory committed Sep 14, 2012
1 parent 5081be1 commit c13ed3366b7e4abbcbcf6b79127a180c87a342ac
Showing with 4 additions and 4 deletions.
  1. +1 −1 lib/Cake/Utility/ClassRegistry.php
  2. +3 −3 lib/Cake/Utility/Folder.php
@@ -165,7 +165,7 @@ public static function init($class, $strict = false) {
$instance = $reflection->newInstance();
}
if ($strict && !$instance instanceof Model) {
$instance = null;
$instance = null;
}
}
if (!isset($instance)) {
@@ -44,7 +44,7 @@ class Folder {
* @constant SKIP
*/
const SKIP = 'skip';
/**
* Path to Folder.
*
@@ -658,7 +658,7 @@ public function copy($options = array()) {
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 @@ public function copy($options = array()) {
$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);
}

0 comments on commit c13ed33

Please sign in to comment.
You can’t perform that action at this time.