Skip to content
Permalink
Browse files

Reverting change made in [7cde309]. Readding trim() to fix issues on …

…windows. Updating tests so they continue to pass on macos. Fixes #769
  • Loading branch information...
markstory committed May 30, 2010
1 parent 907af96 commit 07948a733d59df06dd965355be1c62c1c27e57c2
Showing with 2 additions and 2 deletions.
  1. +1 −1 cake/libs/file.php
  2. +1 −1 cake/tests/cases/libs/file.test.php
@@ -192,7 +192,7 @@ function read($bytes = false, $mode = 'rb', $force = false) {
if ($bytes === false) {
$this->close();
}
return $data;
return trim($data);
}
/**
@@ -115,7 +115,7 @@ function testRead() {
$this->File->lock = true;
$result = $this->File->read();
$expecting = file_get_contents(__FILE__);
$this->assertEqual($result, $expecting);
$this->assertEqual($result, trim($expecting));
$this->File->lock = null;
$data = $expecting;

0 comments on commit 07948a7

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