Skip to content

Fix: New revision is created but no changes were made #6062 #6063

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
tortillas5 wants to merge 1 commit into
base: development
Choose a base branch
from
+14 −12
Open

Fix: New revision is created but no changes were made #6062 #6063

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 14 additions & 12 deletions app/Entities/Repos/PageRepo.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -118,27 +118,29 @@ public function setContentFromInput(Page $page, array $input): void
*/
public function update(Page $page, array $input): Page
{
// Hold the old details to compare later
// Hold the old details to compare later.
$oldName = $page->name;
$oldHtml = $page->html;
$oldMarkdown = $page->markdown;

$this->updateTemplateStatusAndContentFromInput($page, $input);
$page = $this->baseRepo->update($page, $input);

// Update with new details
$page->revision_count++;
$page->save();

// Remove all update drafts for this user and page.
$this->revisionRepo->deleteDraftsForCurrentUser($page);

// Save a revision after updating
// Values used to determine if a change has been made.
$summary = trim($input['summary'] ?? '');
$htmlChanged = isset($input['html']) && $input['html'] !== $oldHtml;
$htmlChanged = isset($page->html) && $page->html !== $oldHtml;
$nameChanged = isset($input['name']) && $input['name'] !== $oldName;
$markdownChanged = isset($input['markdown']) && $input['markdown'] !== $oldMarkdown;
$markdownChanged = isset($page->markdown) && $page->markdown !== $oldMarkdown;

// Update with new details, only if the page really changed.
if ($htmlChanged || $nameChanged || $markdownChanged || $summary) {
$page = $this->baseRepo->update($page, $input);

$page->revision_count++;
$page->save();

// Remove all update drafts for this user and page.
$this->revisionRepo->deleteDraftsForCurrentUser($page);

$this->revisionRepo->storeNewForPage($page, $summary);
}

Expand Down