浏览代码

Fix for php7.2

mscherer 7 年之前
父节点
当前提交
98a94436ff
共有 2 个文件被更改,包括 2 次插入14 次删除
  1. 1 13
      src/Mailer/Email.php
  2. 1 1
      src/View/Helper/ObfuscateHelper.php

+ 1 - 13
src/Mailer/Email.php

@@ -21,13 +21,6 @@ class Email extends CakeEmail {
 	protected $_wrapLength = null;
 
 	/**
-	 * @deprecated Since CakePHP 3.4.0-RC4 in core
-	 *
-	 * @var int|null
-	 */
-	protected $_priority = null;
-
-	/**
 	 * @var string|null
 	 */
 	protected $_error = null;
@@ -563,14 +556,9 @@ class Email extends CakeEmail {
 			'cc' => $this->_cc,
 			'subject' => $this->_subject,
 			'bcc' => $this->_bcc,
-			'transport' => get_class($this->_transport),
+			'transport' => $this->_transport ? get_class($this->_transport) : null,
 		];
 
-		/** @deprecated Since CakePHP 3.4.0-RC4 in core */
-		if ($this->_priority) {
-			$this->_headers['X-Priority'] = $this->_priority;
-		}
-
 		// if not live, just log but do not send any mails //TODO: remove and use Debug Transport!
 		if (!Configure::read('Config.live')) {
 			$this->_logEmail();

+ 1 - 1
src/View/Helper/ObfuscateHelper.php

@@ -82,7 +82,7 @@ class ObfuscateHelper extends Helper {
 		$attr = array_merge($defaults, $attr);
 
 		$xmail = $this->Html->link('', $encMail . $querystring, $attr);
-		$xmail1 = mb_substr($xmail, 0, count($xmail) - 5);
+		$xmail1 = mb_substr($xmail, 0, -5);
 		$xmail2 = mb_substr($xmail, -4, 4);
 
 		$len = mb_strlen($xmail1);