Merge branch 'next' of github.com:WoltLab/WCF into next

diff --cc com.woltlab.wcf/templates/headIncludeJavaScript.tpl
Simple merge

diff --cc wcfsetup/install/files/acp/templates/header.tpl
index 9c504da33c608bd321aeb336e3a7876f4700a8b1,716176a5f00b0b90fb7660fdd3e48ee112cc3851..7dd699d1dda57f06ce3a266aed0103bd758b3c09
--- 1/wcfsetup/install/files/acp/templates/header.tpl
--- 2/wcfsetup/install/files/acp/templates/header.tpl
+++ b/wcfsetup/install/files/acp/templates/header.tpl
@@@ -122,9 -117,10 +122,9 @@@
                                }
                        });
                        
-                       User.init({@$__wcf->user->userID}, '{@$__wcf->user->username|encodeJS}');
+                       User.init({@$__wcf->user->userID}, '{@$__wcf->user->username|encodeJS}', {if $__wcf->user->userID}'{@$__wcf->user->getLink()|encodeJS}'{else}''{/if});
                });
        </script>
 -      {js application='wcf' lib='jquery'}
        
        <script>
                // prevent jQuery and other libraries from utilizing define()

diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/Controller/Media/List.js
index 2d6bdb86df6ff98bf8d31a1c9f15cbdaea3df776,b787bdcd9d07914fee9ef52d7261d4e4505164f4..cbf5a0aea516276d14d38d1e0982b2c329a707eb
--- 1/wcfsetup/install/files/js/WoltLabSuite/Core/Controller/Media/List.js
--- 2/wcfsetup/install/files/js/WoltLabSuite/Core/Controller/Media/List.js
+++ b/wcfsetup/install/files/js/WoltLabSuite/Core/Controller/Media/List.js
@@@ -6,20 -6,24 +6,34 @@@
   * @license   GNU Lesser General Public License <http://opensource.org/licenses/lgpl-license.php>
   * @module    WoltLabSuite/Core/Controller/Media/List
   */
- define(['EventHandler', 'WoltLabSuite/Core/Controller/Clipboard', 'WoltLabSuite/Core/Media/Editor', 'WoltLabSuite/Core/Media/List/Upload'], function(EventHandler, Clipboard, MediaEditor, MediaListUpload) {
+ define([
+               'Dom/ChangeListener',
+               'EventHandler',
+               'WoltLabSuite/Core/Controller/Clipboard',
+               'WoltLabSuite/Core/Media/Editor',
+               'WoltLabSuite/Core/Media/List/Upload'
+       ],
+       function(
+               DomChangeListener,
+               EventHandler,
+               Clipboard,
+               MediaEditor,
+               MediaListUpload
+       ) {
        "use strict";
        
 +      if (!COMPILER_TARGET_DEFAULT) {
 +              var Fake = function() {};
 +              Fake.prototype = {
 +                      init: function() {},
 +                      _clipboardAction: function() {},
 +                      _edit: function() {}
 +              };
 +              return Fake;
 +      }
 +      
        var _mediaEditor;
+       var _tableBody = elById('mediaListTableBody');
        
        /**
         * @exports     WoltLabSuite/Core/Controller/Media/List

diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/Media/List/Upload.js
Simple merge

diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/Media/Upload.js
Simple merge

diff --cc wcfsetup/install/files/js/WoltLabSuite/Core/Upload.js
Simple merge