From: Alexander Ebert <ebert@woltlab.com>
Date: Wed, 17 May 2017 14:18:38 +0000 (+0200)
Subject: Merge branch 'next' of github.com:WoltLab/WCF into next
X-Git-Tag: 3.1.0_Alpha_1~461
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=6ef618c7f6df21ce72f14191d12652b4f578ec5a;p=GitHub%2FWoltLab%2FWCF.git

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

6ef618c7f6df21ce72f14191d12652b4f578ec5a
diff --cc wcfsetup/install/files/acp/templates/header.tpl
index 9c504da33c,716176a5f0..7dd699d1dd
--- a/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 2d6bdb86df,b787bdcd9d..cbf5a0aea5
--- a/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