From: Matthias Schmidt <gravatronics@live.com>
Date: Mon, 24 Mar 2014 18:48:29 +0000 (+0100)
Subject: Fixes some issues
X-Git-Tag: 2.1.0_Alpha_1~978
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=dbe622adc1d8a200e50a3201753f74fcb80f8287;p=GitHub%2FWoltLab%2FWCF.git

Fixes some issues
---

diff --git a/com.woltlab.wcf/templates/user.tpl b/com.woltlab.wcf/templates/user.tpl
index a06771db0f..fc1323ec1e 100644
--- a/com.woltlab.wcf/templates/user.tpl
+++ b/com.woltlab.wcf/templates/user.tpl
@@ -79,7 +79,7 @@
 				});
 			{/if}
 			
-			{if $isAccessible}
+			{if $isAccessible && $__wcf->user->userID != $user->userID}
 				WCF.Language.addObject({
 					'wcf.user.ban': '{lang}wcf.user.ban{/lang}',
 					'wcf.user.ban.confirmMessage': '{lang}wcf.user.ban.confirmMessage{/lang}',
@@ -179,7 +179,7 @@
 			
 			{event name='buttons'}
 			
-			{if $__wcf->session->getPermission('admin.user.canBanUser') || $__wcf->session->getPermission('admin.user.canDisableAvatar') || $__wcf->session->getPermission('admin.user.canDisableSignature') || ($__wcf->session->getPermission('admin.general.canUseAcp') && $__wcf->session->getPermission('admin.user.canEditUser'))}
+			{if $isAccessible && $__wcf->user->userID != $user->userID && ($__wcf->session->getPermission('admin.user.canBanUser') || $__wcf->session->getPermission('admin.user.canDisableAvatar') || $__wcf->session->getPermission('admin.user.canDisableSignature') || ($__wcf->session->getPermission('admin.general.canUseAcp') && $__wcf->session->getPermission('admin.user.canEditUser')))}
 				<li class="dropdown">
 					{* todo: better icon? *}
 					<a href="{link controller='UserEdit' object=$user isACP=true}{/link}" class="button jsTooltip jsUserInlineEditor" title="{lang}wcf.user.moderate{/lang}"><span class="icon icon16 icon-lock"></span> <span class="invisible">{lang}{lang}wcf.acp.user.edit{/lang}{/lang}</span></a>
diff --git a/wcfsetup/install/files/js/WCF.User.js b/wcfsetup/install/files/js/WCF.User.js
index b1bffff2b3..6cb887ae67 100644
--- a/wcfsetup/install/files/js/WCF.User.js
+++ b/wcfsetup/install/files/js/WCF.User.js
@@ -2704,8 +2704,8 @@ WCF.User.InlineEditor = WCF.InlineEditor.extend({
 	_updateState: function(data) {
 		this._notification.show();
 		
-		for (var $index in this._updateData) {
-			var $data = this._updateData[$index];
+		for (var $i = 0, $length = this._updateData.length; $i < $length; $i++) {
+			var $data = this._updateData[$i];
 			var $element = $('#' + $data.elementID);
 			
 			for (var $property in $data.data) {