Merge branch 'master' of https://gitlab.zcorp.cc/easycorp/zentaopms into release/zentaopms_18.3

2023-03-21 17:00:05 +08:00
parent a99b3fea8c 6ecac70d85
commit c7cb7e96c2
62 changed files with 426 additions and 245 deletions
@@ -282,7 +282,7 @@ class doc extends control
        if($confirm == 'no')
        {
            $deleteTip = $type == 'book' ? $this->lang->doc->confirmDeleteBook : $this->lang->doc->confirmDeleteLib;
-            return print(js::confirm($deleteTip, $this->createLink('doc', 'deleteLib', "libID=$libID&confirm=yes&type=$lib&from=$from")));
+            return print(js::confirm($deleteTip, $this->createLink('doc', 'deleteLib', "libID=$libID&confirm=yes&type=$type&from=$from")));
        }
        else
        {