Merge pull request #3028 from ADmad/3.0

2.5 => 3.0 merge

src/Network/Email/Email.php

@@ -1,7 +1,5 @@
 <?php
 /**
- * CakePHP Email
- *
  * CakePHP(tm) : Rapid Development Framework (http://cakephp.org)
  * Copyright (c) Cake Software Foundation, Inc. (http://cakefoundation.org)
  *
@@ -1067,9 +1065,10 @@ class Email {
 				}
 				$fileInfo['data'] = chunk_split(base64_encode($fileInfo['data']), 76, "\r\n");
 			} else {
+				$fileName = $fileInfo['file'];
 				$fileInfo['file'] = realpath($fileInfo['file']);
 				if ($fileInfo['file'] === false || !file_exists($fileInfo['file'])) {
-					throw new Error\SocketException('File not found: "%s"', $fileInfo['file']);
+					throw new Error\SocketException('File not found: "%s"', $fileName);
 				}
 				if (is_int($name)) {
 					$name = basename($fileInfo['file']);