From 6720ec0cb7a9f5175f13a451b21389c68f637c02 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Thu, 15 Nov 2018 10:53:08 +0000
Subject: [PATCH] Merge branch
 '5797-cancel-button-has-no-effect-apply-template' into '1.4-dev'

Resolve "cancel button has no effect (apply template)"

See merge request fusiondirectory/fd!455

(cherry picked from commit 89a1cbff2a6d42dff9871aa744702e7354e23712)

41bea421 :ambulance: fix(templateDialog) Remove lock on objects when canceling
---
 include/simpleplugin/class_simpleManagement.inc | 1 +
 1 file changed, 1 insertion(+)

diff --git a/include/simpleplugin/class_simpleManagement.inc b/include/simpleplugin/class_simpleManagement.inc
index 2aa8bb455..a0bc81c69 100644
--- a/include/simpleplugin/class_simpleManagement.inc
+++ b/include/simpleplugin/class_simpleManagement.inc
@@ -118,6 +118,7 @@ class templateDialog
 
   function handle_cancel ()
   {
+    $this->simpleManagement->remove_lock();
     $this->simpleManagement->closeDialogs();
     return FALSE;
   }
-- 
GitLab