diff --git a/docs/images/wiki-move.png b/docs/images/wiki-move.png index d39ac92..239eb02 100644 Binary files a/docs/images/wiki-move.png and b/docs/images/wiki-move.png differ diff --git a/styles/prosilver/template/article_move.html b/styles/prosilver/template/article_move.html index 4f79ca4..22a5fc1 100644 --- a/styles/prosilver/template/article_move.html +++ b/styles/prosilver/template/article_move.html @@ -35,7 +35,7 @@

{L_WIKI_MOVE_ARTICLE}{L_COLON} {ARTICLE_NAME}

- {L_CANCEL} + {S_FORM_TOKEN}
diff --git a/wiki/move.php b/wiki/move.php index 8b68c40..edc7ce1 100644 --- a/wiki/move.php +++ b/wiki/move.php @@ -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; @@ -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'));