Merge branch 'master' into zenops_46

2022-09-30 15:07:37 +08:00
parent 6bed7509e7 05046906ea
commit 0afdc68654
81 changed files with 798 additions and 318 deletions
@@ -586,7 +586,7 @@ class actionModel extends model
                    if($history->field == 'git') $history->diff = str_replace('+', '%2B', $history->diff);
                }
            }
-            elseif($actionName == 'linkstory' or $actionName == 'unlinkstory')
+            elseif(strpos('linkstory,unlinkstory,createchildrenstory', $actionName) !== false)
            {
                $extra = '';
                foreach(explode(',', $action->extra) as $id) $extra .= common::hasPriv('story', 'view') ? html::a(helper::createLink('story', 'view', "storyID=$id"), "#$id ") . ', ' : "#$id, ";