From dcb395528361019b7784e99e26f23a43a58d084d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?C=C3=B4me=20Chilliet?= <come@opensides.be>
Date: Thu, 15 Nov 2018 11:06:45 +0000
Subject: [PATCH] Merge branch 'cherry-pick-89a1cbff' into '1.3-dev'

Merge branch '5797-cancel-button-has-no-effect-apply-template' into '1.3-dev'

See merge request fusiondirectory/fd!456

(cherry picked from commit 3d826a19be77880cb7489a7f70d8d57cfc8d588b)

6720ec0c Merge branch '5797-cancel-button-has-no-effect-apply-template' into '1.4-dev'
---
 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 52603afa2..7a8bb39f5 100644
--- a/include/simpleplugin/class_simpleManagement.inc
+++ b/include/simpleplugin/class_simpleManagement.inc
@@ -110,6 +110,7 @@ class templateDialog
 
   function handle_cancel ()
   {
+    $this->simpleManagement->remove_lock();
     $this->simpleManagement->closeDialogs();
     return FALSE;
   }
-- 
GitLab