Merge branch 'master' into next

# Conflicts:
#	com.woltlab.wcf/templates/moderationComment.tpl

diff --cc com.woltlab.wcf/templates/moderationComment.tpl
index 855b17aae3c56cd287e1302d8147ba77c59a426f,333d4c4a913c50d5ebf59a2f9ff502b0397f5485..aa523aad766549569b0ad919bbd950f747c6c825
--- 1/com.woltlab.wcf/templates/moderationComment.tpl
--- 2/com.woltlab.wcf/templates/moderationComment.tpl
+++ b/com.woltlab.wcf/templates/moderationComment.tpl
@@@ -1,34 -1,39 +1,44 @@@
 -<article class="message messageReduced">
 -      <div>
 -              <section class="messageContent">
 -                      <div>
 -                              <header class="messageHeader">
 -                                      <div class="box32">
 -                                              {if $message->userID}
 -                                                      <a href="{link controller='User' object=$message->getUserProfile()->getDecoratedObject()}{/link}" class="framed">{@$message->getUserProfile()->getAvatar()->getImageTag(32)}</a>
 -                                              {else}
 -                                                      <span class="framed">{@$message->getUserProfile()->getAvatar()->getImageTag(32)}</span>
 -                                              {/if}
 -                                              
 -                                              <div class="messageHeadline">
 -                                                      <h1><a href="{@$message->getLink()}">{$message->getTitle()}</a></h1>
 -                                                      <p>
 -                                                              <span class="username">
 -                                                                      {if $message->userID}
 -                                                                              <a href="{link controller='User' object=$message->getUserProfile()->getDecoratedObject()}{/link}">{$message->getUsername()}</a>
 -                                                                      {else}
 -                                                                              {$message->getUsername()}
 -                                                                      {/if}
 -                                                              </span>
 -                                                              {@$message->getTime()|time}
 -                                                      </p>
 -                                              </div>
 -                                      </div>
 -                              </header>
 +<article class="message">
 +      <section class="messageContent">
 +              <header class="messageHeader">
 +                      <div class="box32 messageHeaderWrapper">
-                               <a href="{link controller='User' object=$message->getUserProfile()->getDecoratedObject()}{/link}">{@$message->getUserProfile()->getAvatar()->getImageTag(32)}</a>
++                              {if $message->userID}
++                                      <a href="{link controller='User' object=$message->getUserProfile()->getDecoratedObject()}{/link}" class="framed">{@$message->getUserProfile()->getAvatar()->getImageTag(32)}</a>
++                              {else}
++                                      <span class="framed">{@$message->getUserProfile()->getAvatar()->getImageTag(32)}</span>
++                              {/if}
                                
 -                              <div class="messageBody">
 -                                      <div>
 -                                              <div class="messageText">
 -                                                      {@$message->getFormattedMessage()}
 -                                              </div>
 -                                      </div>
 +                              <div class="messageHeaderBox">
 +                                      <h2 class="messageTitle">
 +                                              <a href="{@$message->getLink()}">{$message->getTitle()}</a>
 +                                      </h2>
 +                                      
 +                                      <ul class="messageHeaderMetaData">
-                                               <li><a href="{link controller='User' object=$message->getUserProfile()->getDecoratedObject()}{/link}" class="username">{$message->getUsername()}</a></li>
++                                              <li>
++                                                      {if $message->userID}
++                                                              <a href="{link controller='User' object=$message->getUserProfile()->getDecoratedObject()}{/link}" class="username">{$message->getUsername()}</a>
++                                                      {else}
++                                                              {$message->getUsername()}
++                                                      {/if}
++                                              </li>
 +                                              <li><span class="messagePublicationTime">{@$message->getTime()|time}</span></li>
 +                                              
 +                                              {event name='messageHeaderMetaData'}
 +                                      </ul>
                                </div>
                        </div>
 -              </section>
 -      </div>
 -</article>
 +                      
 +                      {event name='messageHeader'}
 +              </header>
 +              
 +              <div class="messageBody">
 +                      {event name='beforeMessageText'}
 +                      
 +                      <div class="messageText">
 +                              {@$message->getFormattedMessage()}
 +                      </div>
 +                      
 +                      {event name='afterMessageText'}
 +              </div>
 +      </section>
 +</article>