From: Tim Düsterhus Date: Fri, 29 Jul 2016 12:10:37 +0000 (+0200) Subject: Remove some remains of Community Framework 2.2 X-Git-Tag: 3.0.0_Beta_1~921 X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=115c251e7faa92283236a4d1db719e6f5debc83e;p=GitHub%2FWoltLab%2FWCF.git Remove some remains of Community Framework 2.2 --- diff --git a/wcfsetup/install/files/lib/system/email/Email.class.php b/wcfsetup/install/files/lib/system/email/Email.class.php index 9178af0c27..2df84bd107 100644 --- a/wcfsetup/install/files/lib/system/email/Email.class.php +++ b/wcfsetup/install/files/lib/system/email/Email.class.php @@ -482,7 +482,7 @@ class Email { $mail = clone $this; if ($recipient['mailbox'] instanceof UserMailbox) { - $mail->addHeader('X-Community-Framework-Recipient', $recipient['mailbox']->getUser()->username); + $mail->addHeader('X-WoltLab-Suite-Recipient', $recipient['mailbox']->getUser()->username); } if ($this->body instanceof IRecipientAwareMimePart) $this->body->setRecipient($recipient['mailbox']); diff --git a/wcfsetup/install/files/lib/system/email/mime/AbstractMultipartMimePart.class.php b/wcfsetup/install/files/lib/system/email/mime/AbstractMultipartMimePart.class.php index 3abf8bee66..798b83fc79 100644 --- a/wcfsetup/install/files/lib/system/email/mime/AbstractMultipartMimePart.class.php +++ b/wcfsetup/install/files/lib/system/email/mime/AbstractMultipartMimePart.class.php @@ -29,7 +29,7 @@ abstract class AbstractMultipartMimePart extends AbstractMimePart implements IRe * Sets the multipart boundary. */ public function __construct() { - $this->boundary = "WoltLab_Community_Framework=_".StringUtil::getRandomID(); + $this->boundary = "WoltLab_Suite=_".StringUtil::getRandomID(); $this->parts = new \SplObjectStorage(); } diff --git a/wcfsetup/install/files/lib/system/mail/DebugMailSender.class.php b/wcfsetup/install/files/lib/system/mail/DebugMailSender.class.php index dbf41b1a8e..b0ca59fa76 100644 --- a/wcfsetup/install/files/lib/system/mail/DebugMailSender.class.php +++ b/wcfsetup/install/files/lib/system/mail/DebugMailSender.class.php @@ -10,7 +10,7 @@ use wcf\system\io\File; * @copyright 2001-2016 WoltLab GmbH * @license GNU Lesser General Public License * @package WoltLabSuite\Core\Data\Mail - * @deprecated The Community Framework < 2.2 mail API is deprecated in favor of \wcf\system\email\*. + * @deprecated The Community Framework 2.x mail API is deprecated in favor of \wcf\system\email\*. */ class DebugMailSender extends MailSender { /** diff --git a/wcfsetup/install/files/lib/system/mail/Mail.class.php b/wcfsetup/install/files/lib/system/mail/Mail.class.php index d789d656e0..92dc9231e5 100644 --- a/wcfsetup/install/files/lib/system/mail/Mail.class.php +++ b/wcfsetup/install/files/lib/system/mail/Mail.class.php @@ -12,7 +12,7 @@ use wcf\util\StringUtil; * @copyright 2001-2016 WoltLab GmbH * @license GNU Lesser General Public License * @package WoltLabSuite\Core\Data\Mail - * @deprecated The Community Framework < 2.2 mail API is deprecated in favor of \wcf\system\email\*. + * @deprecated The Community Framework 2.x mail API is deprecated in favor of \wcf\system\email\*. */ class Mail { /** diff --git a/wcfsetup/install/files/lib/system/mail/MailSender.class.php b/wcfsetup/install/files/lib/system/mail/MailSender.class.php index 516c487ac7..51332b4fa6 100644 --- a/wcfsetup/install/files/lib/system/mail/MailSender.class.php +++ b/wcfsetup/install/files/lib/system/mail/MailSender.class.php @@ -8,7 +8,7 @@ namespace wcf\system\mail; * @copyright 2001-2016 WoltLab GmbH * @license GNU Lesser General Public License * @package WoltLabSuite\Core\Data\Mail - * @deprecated The Community Framework < 2.2 mail API is deprecated in favor of \wcf\system\email\*. + * @deprecated The Community Framework 2.x mail API is deprecated in favor of \wcf\system\email\*. */ abstract class MailSender { /** diff --git a/wcfsetup/install/files/lib/system/mail/PHPMailSender.class.php b/wcfsetup/install/files/lib/system/mail/PHPMailSender.class.php index 4405ee9d85..a6903b2701 100644 --- a/wcfsetup/install/files/lib/system/mail/PHPMailSender.class.php +++ b/wcfsetup/install/files/lib/system/mail/PHPMailSender.class.php @@ -8,7 +8,7 @@ namespace wcf\system\mail; * @copyright 2001-2016 WoltLab GmbH * @license GNU Lesser General Public License * @package WoltLabSuite\Core\Data\Mail - * @deprecated The Community Framework < 2.2 mail API is deprecated in favor of \wcf\system\email\*. + * @deprecated The Community Framework 2.x mail API is deprecated in favor of \wcf\system\email\*. */ class PHPMailSender extends MailSender { /** diff --git a/wcfsetup/install/files/lib/system/mail/SMTPMailSender.class.php b/wcfsetup/install/files/lib/system/mail/SMTPMailSender.class.php index e909308192..475f5bbe13 100644 --- a/wcfsetup/install/files/lib/system/mail/SMTPMailSender.class.php +++ b/wcfsetup/install/files/lib/system/mail/SMTPMailSender.class.php @@ -11,7 +11,7 @@ use wcf\util\StringUtil; * @copyright 2001-2016 WoltLab GmbH * @license GNU Lesser General Public License * @package WoltLabSuite\Core\Data\Mail - * @deprecated The Community Framework < 2.2 mail API is deprecated in favor of \wcf\system\email\*. + * @deprecated The Community Framework 2.x mail API is deprecated in favor of \wcf\system\email\*. */ class SMTPMailSender extends MailSender { /**