* Merge 169 untrack file to master.

2021-12-08 11:07:06 +08:00
parent 87c24eae5a
commit 13f162edd2
49 changed files with 159 additions and 82 deletions
--- a/module/message/model.php
+++ b/module/message/model.php
@@ -47,10 +47,7 @@ class messageModel extends model
        $objectActions = array();
        foreach($this->config->message->objectTypes as $objectType => $actions)
        {
-            foreach($actions as $action)
-            {
-                $objectActions[$objectType][$action] = str_replace($this->lang->webhook->trimWords, '', $this->lang->action->label->$action);
-            }
+            foreach($actions as $action) $objectActions[$objectType][$action] = $this->lang->message->label->$action;
        }
        return $objectActions;
    }