Skip to content

Make Cancel on the Move article page a real form button #79

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鈥檒l occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
bonelifer merged 2 commits into from
Oct 15, 2026
Merged

Make Cancel on the Move article page a real form button #79

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
d806cf5
Make Cancel on the Move article page a real form button
bonelifer Oct 15, 2026
2e1b421
Retake the move form screenshot with the fixed Cancel
bonelifer Oct 15, 2026
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
Binary file modified docs/images/wiki-move.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion styles/prosilver/template/article_move.html
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,7 +35,7 @@ <h2>{L_WIKI_MOVE_ARTICLE}{L_COLON} {ARTICLE_NAME}</h2>
<div class="panel bg2">
<div class="inner">
<fieldset class="submit-buttons">
<a href="{U_CANCEL}" class="button2">{L_CANCEL}</a>
<input type="submit" name="cancel" value="{L_CANCEL}" class="button2">
<input type="submit" name="submit" value="{L_WIKI_MOVE_ARTICLE}" class="button1">
{S_FORM_TOKEN}
</fieldset>
Expand Down
6 changes: 5 additions & 1 deletion wiki/move.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -122,6 +122,11 @@ public function page($article)
trigger_error('NO_ARTICLE');
}

if ($this->request->is_set_post('cancel'))
{
redirect($this->helper->route('phpbbmodders_wiki_article', array('article' => $article)));
}

add_form_key('wiki_move');
// The request escapes HTML. Names are stored as written, titles escaped, as an edit stores them.
$new_name = $this->request->is_set_post('new_name') ? trim(htmlspecialchars_decode($this->request->variable('new_name', '', true), ENT_COMPAT)) : $article;
Expand Down Expand Up @@ -179,7 +184,6 @@ public function page($article)
'S_LEAVE_REDIRECT' => $leave_redirect,
'TEMPLATE_USED_BY' => $used_by ? $this->user->lang('WIKI_MOVE_TEMPLATE_WARNING', $used_by) : '',
'U_ACTION' => $this->helper->route('phpbbmodders_wiki_article', array('article' => $article, 'action' => 'move')),
'U_CANCEL' => $this->helper->route('phpbbmodders_wiki_article', array('article' => $article)),
));

return $this->helper->render('article_move.html', $this->user->lang('WIKI_MOVE_ARTICLE'));
Expand Down
Loading