Add missing entry to CHANGELOG and add since tag

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e04d30361f23dc9fb090bb5ec731664166750c84..5a6dc9ca0a69af74fe9f30d20b3e529e8acecfd2 100644 (file)
--- 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 07739a8757773bf29f8b92ed8f4831c42926be16..a950eabff26358fe9fd5f1bf0f563adbba20cd90 100644 (file)
--- 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