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

…windows. Updating tests so they continue to pass on macos. Fixes #769
cakephp · May 31, 2010 · ea2f032 · ea2f032
1 parent 22e942c
commit ea2f032
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/cake/libs/file.php b/cake/libs/file.php
@@ -186,7 +186,7 @@ public function read($bytes = false, $mode = 'rb', $force = false) {
 		if ($bytes === false) {
 			$this->close();
 		}
-		return $data;
+		return trim($data);
 	}
 
 /**

diff --git a/cake/tests/cases/libs/file.test.php b/cake/tests/cases/libs/file.test.php
@@ -133,7 +133,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;