From 84c6bbf86499d7ef2618a6ab21d4eea124dd1066 Mon Sep 17 00:00:00 2001 From: caoyanyi Date: Thu, 21 Dec 2023 11:23:06 +0800 Subject: [PATCH] * Adjust action set for instance. --- module/action/model.php | 24 ++++++++++++++---------- 1 file changed, 14 insertions(+), 10 deletions(-) diff --git a/module/action/model.php b/module/action/model.php index 4d2082a5f4..ea88db03c8 100755 --- a/module/action/model.php +++ b/module/action/model.php @@ -998,21 +998,25 @@ class actionModel extends model $action->newMemory = $action->comment; $action->comment = ''; } + if(!empty($extra)) { - $action->oldName = zget($extra->data, 'oldName', ''); - $action->newName = zget($extra->data, 'newName', ''); - $action->oldVersion = zget($extra->data, 'oldVersion', ''); - $action->newVersion = zget($extra->data, 'newVersion', ''); - $action->oldAppName = zget($extra->data, 'oldAppName', ''); - $action->newAppName = zget($extra->data, 'newAppName', ''); - $enableAutoBackup = zget($extra->data, 'autoBackup', 0); - - if($actionType == 'saveautobackupsettings' && $enableAutoBackup) $desc = $this->lang->action->desc->closeautobackupsettings; $action->extra = ''; + if(!empty($extra->data)) + { + $action->oldName = zget($extra->data, 'oldName', ''); + $action->newName = zget($extra->data, 'newName', ''); + $action->oldVersion = zget($extra->data, 'oldVersion', ''); + $action->newVersion = zget($extra->data, 'newVersion', ''); + $action->oldAppName = zget($extra->data, 'oldAppName', ''); + $action->newAppName = zget($extra->data, 'newAppName', ''); + $enableAutoBackup = zget($extra->data, 'autoBackup', 0); + + if($actionType == 'saveautobackupsettings' && $enableAutoBackup) $desc = $this->lang->action->desc->closeautobackupsettings; + } if(!empty($extra->result->code) && $extra->result->code != 200 && !empty($extra->result->message)) $action->comment = $extra->result->message; - if(is_string($extra->result) && $extra->result != 'fail') + if(is_string($extra->result) && $extra->result != 'fail' && isset($extra->message)) { $action->comment = "\n" . $extra->message; }