Merge branch 'zentaopms_wangyuting' into 'master'

* Fix webhook content is markdown bug. See merge request easycorp/zentaopms!6868
2023-02-07 03:08:09 +00:00
parent 388ae5dae0 d0d3b94b99
commit 45d1ee9054
1 changed files with 4 additions and 0 deletions
@@ -122,6 +122,10 @@ class webhookModel extends model
            {
                $text = substr($data->markdown->content, 0, strpos($data->markdown->content, '(http'));
            }
+            elseif(isset($data->text->content))
+            {
+                $text = substr($data->text->content, 0, strpos($data->text->content, '(http'));
+            }
            elseif(isset($data->content))
            {
                $text = $data->content->text;