From: Matthias Schmidt <gravatronics@live.com>
Date: Mon, 14 Mar 2016 16:58:25 +0000 (+0100)
Subject: Add missing entry to CHANGELOG and add since tag
X-Git-Tag: 3.0.0_Beta_1~2034
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=406e0d016fe96358617c9d64bb00c12fde217ed0;p=GitHub%2FWoltLab%2FWCF.git

Add missing entry to CHANGELOG and add since tag
---

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e04d30361f..5a6dc9ca0a 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -26,6 +26,7 @@
 * Make user options shown in sidebar sortable.
 * `wcf\system\event\listener\AbstractUserActionRenameListener` added.
 * `wcf\system\event\listener\AbstractUserMergeListener` added.
+* Notice texts support `{$username}` and `{$email}` placeholders.
 
 #### New Traits
 
diff --git a/wcfsetup/install/files/lib/data/notice/Notice.class.php b/wcfsetup/install/files/lib/data/notice/Notice.class.php
index 07739a8757..a950eabff2 100644
--- a/wcfsetup/install/files/lib/data/notice/Notice.class.php
+++ b/wcfsetup/install/files/lib/data/notice/Notice.class.php
@@ -38,6 +38,7 @@ class Notice extends DatabaseObject implements IRouteController {
 	 * Returns the textual representation of the notice.
 	 * 
 	 * @return	string
+	 * @since	2.2
 	 */
 	public function __toString() {
 		// replace `{$username}` with the active user's name and the `{$email}` with the active users' email address