Merge branch '5.4' into 5.5

diff --cc wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
index 0ff0d74d7e459a555222291517b6bb3c61ae1c76,f8d8434e58860fe9e68a02fa099c971f46a8eaf5..0990bd5079e6466b71189ec1ca01c9d6929bc202
--- 1/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
--- 2/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
+++ b/wcfsetup/install/files/acp/templates/pageHeaderUser.tpl
@@@ -37,12 -37,12 +37,12 @@@
                        <li id="woltlab" class="dropdown">
                                <a href="#" class="dropdownToggle jsTooltip" title="WoltLab&reg;"><span class="icon icon32 fa-info"></span></a>
                                
 -                              <ul class="dropdownMenu" data-dropdown-alignment-horizontal="right">
 +                              <ul class="dropdownMenu dropdownMenuUserPanel" data-dropdown-alignment-horizontal="right">
                                        <li><a class="externalURL" href="https://www.woltlab.com/{if $__wcf->getLanguage()->getFixedLanguageCode() === 'de'}de/{/if}"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank" rel="noopener"{/if}>{lang}wcf.acp.index.woltlab.website{/lang}</a></li>
                                        <li><a class="externalURL" href="https://manual.woltlab.com/{if $__wcf->getLanguage()->getFixedLanguageCode() === 'de'}de{else}en{/if}/"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank" rel="noopener"{/if}>{lang}wcf.acp.index.woltlab.manual{/lang}</a></li>
-                                       <li><a class="externalURL" href="https://community.woltlab.com"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank" rel="noopener"{/if}>{lang}wcf.acp.index.woltlab.forums{/lang}</a></li>
+                                       <li><a class="externalURL" href="https://www.woltlab.com/community/"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank" rel="noopener"{/if}>{lang}wcf.acp.index.woltlab.forums{/lang}</a></li>
                                        <li><a class="externalURL" href="https://www.woltlab.com/ticket-add/"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank" rel="noopener"{/if}>{lang}wcf.acp.index.woltlab.tickets{/lang}</a></li>
-                                       <li><a class="externalURL" href="https://pluginstore.woltlab.com"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank" rel="noopener"{/if}>{lang}wcf.acp.index.woltlab.pluginStore{/lang}</a></li>
+                                       <li><a class="externalURL" href="https://www.woltlab.com/pluginstore/"{if EXTERNAL_LINK_TARGET_BLANK} target="_blank" rel="noopener"{/if}>{lang}wcf.acp.index.woltlab.pluginStore{/lang}</a></li>
                                </ul>
                        </li>
                {/if}