fix(Admin/EmailAccount): fix removeAdminAccess for master user

tine-groupware · Jan 14, 2025 · 77bdb67 · 77bdb67
1 parent 22be455
commit 77bdb67
Showing 1 changed file with 9 additions and 7 deletions.
diff --git a/tine20/Admin/Controller/EmailAccount.php b/tine20/Admin/Controller/EmailAccount.php
@@ -183,13 +183,15 @@ public function update(Tinebase_Record_Interface $_record, $_additionalArguments
             $raii = Tinebase_EmailUser::prepareAccountForSieveAdminAccess($_record->getId());
         }
 
-        $this->_inspectBeforeUpdate($_record, $currentAccount);
-        $account = $this->_backend->update($_record);
-        $this->_inspectAfterUpdate($account, $_record, $currentAccount);
-
-        if ($raii && Tinebase_EmailUser::backendSupportsMasterPassword($_record)) {
-            Tinebase_EmailUser::removeAdminAccess();
-            unset($raii);
+        try {
+            $this->_inspectBeforeUpdate($_record, $currentAccount);
+            $account = $this->_backend->update($_record);
+            $this->_inspectAfterUpdate($account, $_record, $currentAccount);
+        } finally {
+            if ($raii && Tinebase_EmailUser::backendSupportsMasterPassword($_record)) {
+                Tinebase_EmailUser::removeAdminAccess();
+                unset($raii);
+            }
         }
 
         return $account;