diff --git a/public/forum/topic.php b/public/forum/topic.php index 4060fef1..47d30408 100644 --- a/public/forum/topic.php +++ b/public/forum/topic.php @@ -160,13 +160,7 @@ if (in_array($moderationMode, $validModerationModes, true)) { } if (!$isXHR) { - if (!$submissionConfirmed) { - header("Location: " . url( - 'forum-topic', - ['topic' => $topic['topic_id']] - )); - break; - } elseif (!isset($_GET['confirm'])) { + if (!isset($_GET['confirm'])) { echo tpl_render('forum.confirm', [ 'title' => 'Confirm topic deletion', 'class' => 'far fa-trash-alt', @@ -177,6 +171,12 @@ if (in_array($moderationMode, $validModerationModes, true)) { ], ]); break; + } elseif (!$submissionConfirmed) { + header("Location: " . url( + 'forum-topic', + ['topic' => $topic['topic_id']] + )); + break; } } @@ -212,12 +212,7 @@ if (in_array($moderationMode, $validModerationModes, true)) { } if (!$isXHR) { - if (!$submissionConfirmed) { - header("Location: " . url('forum-topic', [ - 'topic' => $topic['topic_id'], - ])); - break; - } elseif (!isset($_GET['confirm'])) { + if (!isset($_GET['confirm'])) { echo tpl_render('forum.confirm', [ 'title' => 'Confirm topic restore', 'class' => 'fas fa-magic', @@ -228,6 +223,11 @@ if (in_array($moderationMode, $validModerationModes, true)) { ], ]); break; + } elseif (!$submissionConfirmed) { + header("Location: " . url('forum-topic', [ + 'topic' => $topic['topic_id'], + ])); + break; } } @@ -255,12 +255,7 @@ if (in_array($moderationMode, $validModerationModes, true)) { } if (!$isXHR) { - if (!$submissionConfirmed) { - header('Location: ' . url('forum-topic', [ - 'topic' => $topic['topic_id'], - ])); - break; - } elseif (!isset($_GET['confirm'])) { + if (!isset($_GET['confirm'])) { echo tpl_render('forum.confirm', [ 'title' => 'Confirm topic nuke', 'class' => 'fas fa-radiation', @@ -271,6 +266,11 @@ if (in_array($moderationMode, $validModerationModes, true)) { ], ]); break; + } elseif (!$submissionConfirmed) { + header('Location: ' . url('forum-topic', [ + 'topic' => $topic['topic_id'], + ])); + break; } }