From: Matthias Schmidt <gravatronics@live.com>
Date: Fri, 3 Apr 2015 06:19:40 +0000 (+0200)
Subject: Merge branch '2.0'
X-Git-Tag: 2.1.3~40
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=1c12e361b35120eb919cce7f2d0c74d7b7720974;p=GitHub%2FWoltLab%2FWCF.git

Merge branch '2.0'
---

1c12e361b35120eb919cce7f2d0c74d7b7720974
diff --cc wcfsetup/install/files/acp/templates/userAdd.tpl
index 6aa7b3fd65,60990fda52..59225a6850
--- a/wcfsetup/install/files/acp/templates/userAdd.tpl
+++ b/wcfsetup/install/files/acp/templates/userAdd.tpl
@@@ -471,42 -401,26 +484,47 @@@
  							}
  							else {
  								$('#disableAvatarReason').attr('readonly', true);
 +								$('#disableAvatarNeverExpires, #disableAvatarExpires').disable();
 +								$('#disableAvatarReason, #disableAvatarNeverExpires, #disableAvatarExpires').parents('dl').addClass('disabled');
  							}
  						});
 +						
  						$('#disableAvatar').change();
  						
 +						$('#disableAvatarNeverExpires').change(function() {
 +							if ($('#disableAvatarNeverExpires').is(':checked')) {
 +								$('#disableAvatarExpiresSetting').hide();
 +							}
 +							else {
 +								$('#disableAvatarExpiresSetting').show();
 +							}
 +						});
 +						
 +						$('#disableAvatarNeverExpires').change();
 +						//]]>
 +					</script>
 +				{/if}
 +				
 +				<script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.Message.js?v={@LAST_UPDATE_TIME}"></script>
 +				<script data-relocate="true" src="{@$__wcf->getPath()}js/WCF.User.js?v={@LAST_UPDATE_TIME}"></script>
 +				<script data-relocate="true">
 +					//<![CDATA[
 +					$(function() {
  						WCF.Language.addObject({
+ 							'wcf.user.avatar.type.custom.crop': '{lang}wcf.user.avatar.type.custom.crop{/lang}',
  							'wcf.user.avatar.upload.error.invalidExtension': '{lang}wcf.user.avatar.upload.error.invalidExtension{/lang}',
  							'wcf.user.avatar.upload.error.tooSmall': '{lang}wcf.user.avatar.upload.error.tooSmall{/lang}',
  							'wcf.user.avatar.upload.error.tooLarge': '{lang}wcf.user.avatar.upload.error.tooLarge{/lang}',
  							'wcf.user.avatar.upload.error.uploadFailed': '{lang}wcf.user.avatar.upload.error.uploadFailed{/lang}',
  							'wcf.user.avatar.upload.error.badImage': '{lang}wcf.user.avatar.upload.error.badImage{/lang}',
 -							'wcf.user.avatar.upload.success': '{lang}wcf.user.avatar.upload.success{/lang}',
 -							'wcf.global.button.upload': '{lang}wcf.global.button.upload{/lang}'
 +							'wcf.user.avatar.upload.success': '{lang}wcf.user.avatar.upload.success{/lang}'
  						});
  						
- 						new WCF.User.Avatar.Upload({@$user->userID});
+ 						{if $userAvatar && $userAvatar->canCrop()}
+ 							new WCF.User.Avatar.Upload({@$user->userID}, new WCF.User.Avatar.Crop({@$userAvatar->avatarID}));
+ 						{else}
+ 							new WCF.User.Avatar.Upload({@$user->userID});
+ 						{/if}
  					});
  					//]]>
  				</script>