From 77631a03d8a074a16d7c282e4bf80100ee5a38d2 Mon Sep 17 00:00:00 2001 From: daitingting Date: Fri, 25 Apr 2025 09:05:00 +0000 Subject: [PATCH] * [misc] Adjust order. --- module/story/model.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/module/story/model.php b/module/story/model.php index 6a4c83f607..221e785539 100644 --- a/module/story/model.php +++ b/module/story/model.php @@ -1038,8 +1038,6 @@ class storyModel extends model $isChanged = $oldParentStory->changedBy ? true : false; if($preStatus == 'reviewing') $preStatus = $isChanged ? 'changing' : 'draft'; } - - if($this->config->edition != 'open' && $oldParentStory->feedback) $this->loadModel('feedback')->updateStatus('story', $oldParentStory->feedback, $newParentStory->status, $oldParentStory->status, $oldParentStory->id); } else { @@ -1048,7 +1046,9 @@ class storyModel extends model } $newParentStory = $this->dao->select('*')->from(TABLE_STORY)->where('id')->eq($parentID)->fetch(); - $changes = common::createChanges($oldParentStory, $newParentStory); + if($this->config->edition != 'open' && $oldParentStory->feedback) $this->loadModel('feedback')->updateStatus('story', $oldParentStory->feedback, $status, $oldParentStory->status, $oldParentStory->id); + + $changes = common::createChanges($oldParentStory, $newParentStory); if($action and $changes) { $actionID = $this->loadModel('action')->create('story', $parentID, $action, '', $preStatus, '', false);