From 7a44da85a0f3428c29b1228523da6a1da4a1cddd Mon Sep 17 00:00:00 2001
From: snipe <snipe@snipe.net>
Date: Thu, 4 Oct 2018 02:18:20 -0700
Subject: [PATCH] Fixed issue where admin users could disable activation when
 editing their own profile

---
 resources/views/users/edit.blade.php | 9 ++++++---
 1 file changed, 6 insertions(+), 3 deletions(-)

diff --git a/resources/views/users/edit.blade.php b/resources/views/users/edit.blade.php
index 83d16190f..4f8247af1 100755
--- a/resources/views/users/edit.blade.php
+++ b/resources/views/users/edit.blade.php
@@ -331,16 +331,19 @@
                               @if (config('app.lock_passwords'))
                                   <div class="icheckbox disabled" style="padding-left: 10px;">
                                       <input type="checkbox" value="1" name="activated" class="minimal disabled" {{ (old('activated', $user->activated)) == '1' ? ' checked="checked"' : '' }} disabled="disabled">
+                                      <!-- this is necessary because the field is disabled and will reset -->
+                                      <input type="hidden" name="activated" value="{{ $user->activated }}">
                                       {{ trans('admin/users/general.activated_help_text') }}
                                       <p class="help-block">{{ trans('general.feature_disabled') }}</p>
-                                      kjasdhv
+
                                   </div>
                               @elseif ($user->id === Auth::user()->id)
                                   <div class="icheckbox disabled" style="padding-left: 10px;">
-                                      <input type="checkbox" value="1" name="activated" class="minimal disabled" {{ (old('activated', $user->activated)) == '1' ? ' checked="checked"' : '' }} disabled="disabled">
+                                      <input type="checkbox" value="1" name="activated" class="minimal disabled"  checked="checked" disabled="disabled">
+                                      <!-- this is necessary because the field is disabled and will reset -->
+                                      <input type="hidden" name="activated" value="1">
                                       {{ trans('admin/users/general.activated_help_text') }}
                                       <p class="help-block">{{ trans('admin/users/general.activated_disabled_help_text') }}</p>
-
                                   </div>
                               @else
                                   <div style="padding-left: 10px;">