Merge branch 'cherry-pick-dcb38c57' into '1.3-dev'

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

See merge request fusiondirectory/fd!413

include/simpleplugin/class_simpleManagement.inc

@@ -51,14 +51,15 @@ class templateDialog
 
   function save_object ()
   {
-    if ($this->target === NULL) {
-      if (isset($_POST[$this->post_cancel])) {
-        return $this->handle_cancel();
-      }
-      if ((isset($_POST[$this->post_finish]) || isset($_GET[$this->post_finish])) && is_object($this->template)) {
-        $this->template->save_object();
-        return $this->handle_finish();
-      }
+    if (isset($_POST[$this->post_cancel])) {
+      return $this->handle_cancel();
+    }
+
+    if (($this->target === NULL) &&
+        (isset($_POST[$this->post_finish]) || isset($_GET[$this->post_finish])) &&
+        is_object($this->template)) {
+      $this->template->save_object();
+      return $this->handle_finish();
     }
 
     if (