From 72b41be5b05fa3f79888ae4efe5f2ad86d4dac39 Mon Sep 17 00:00:00 2001
From: zhujinyong <zhujinyong@cnezsoft.com>
Date: Mon, 20 Dec 2021 09:05:16 +0800
Subject: [PATCH] - Remove die() of action module.

---
 module/action/control.php | 10 +++++-----
 module/action/model.php   |  2 +-
 2 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/module/action/control.php b/module/action/control.php
index 61d51ee2d6..a70910daae 100755
--- a/module/action/control.php
+++ b/module/action/control.php
@@ -85,7 +85,7 @@ class action extends control
     public function undelete($actionID)
     {
         $this->action->undelete($actionID);
-        die(js::reload('parent'));
+        echo js::reload('parent');
     }
 
     /**
@@ -98,7 +98,7 @@ class action extends control
     public function hideOne($actionID)
     {
         $this->action->hideOne($actionID);
-        die(js::reload('parent'));
+        echo js::reload('parent');
     }
 
     /**
@@ -112,12 +112,12 @@ class action extends control
     {
         if($confirm == 'no')
         {
-            die(js::confirm($this->lang->action->confirmHideAll, inlink('hideAll', "confirm=yes")));
+            echo js::confirm($this->lang->action->confirmHideAll, inlink('hideAll', "confirm=yes"));
         }
         else
         {
             $this->action->hideAll();
-            die(js::reload('parent'));
+            echo js::reload('parent');
         }
     }
 
@@ -138,7 +138,7 @@ class action extends control
         }
         else
         {
-            die(js::reload('parent'));
+            echo js::reload('parent');
         }
     }
 
diff --git a/module/action/model.php b/module/action/model.php
index d4a510b2ad..f6ceeec36d 100755
--- a/module/action/model.php
+++ b/module/action/model.php
@@ -1384,7 +1384,7 @@ class actionModel extends model
         {
             $module     = $this->dao->select('*')->from(TABLE_MODULE)->where('id')->eq($action->objectID)->fetch();
             $repeatName = $this->loadModel('tree')->checkUnique($module);
-            if($repeatName) die(js::alert(sprintf($this->lang->tree->repeatName, $repeatName)));
+            if($repeatName) return print(js::alert(sprintf($this->lang->tree->repeatName, $repeatName)));
         }
 
         /* Update deleted field in object table. */