Fixes some issues

diff --git a/com.woltlab.wcf/templates/user.tpl b/com.woltlab.wcf/templates/user.tpl
index a06771db0f0990461913b05b70a5d5d6603736e3..fc1323ec1e4b103c380cc456b5d749492cb3ba3a 100644 (file)
--- 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 b1bffff2b381d74a7c9b1ed8b28871908e6762c6..6cb887ae67dd35b602be6feb605c7dfd9d123b96 100644 (file)
--- 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) {