From c2b21b87fd8d42672e523e3bf579c618e783b1d9 Mon Sep 17 00:00:00 2001
From: Damien Regad <dregad@mantisbt.org>
Date: Sun, 27 Aug 2017 12:23:02 +0200
Subject: [PATCH] Move "Reset Prefs" button to footer

Thanks to the 'formaction' attribute, there is no need for a separate
HTML form, so we can reuse the existing hidden inputs to submit to
account_prefs_reset.php.

Fixes #23267
---
 account_prefs_inc.php | 18 +++++-------------
 1 file changed, 5 insertions(+), 13 deletions(-)

diff --git a/account_prefs_inc.php b/account_prefs_inc.php
index f881795000..03b38d290f 100644
--- a/account_prefs_inc.php
+++ b/account_prefs_inc.php
@@ -391,24 +391,16 @@ function edit_account_prefs( $p_user_id = null, $p_error_if_protected = true, $p
 	</div>
 	<div class="widget-toolbox padding-8 clearfix">
 		<input type="submit" class="btn btn-primary btn-white btn-round" value="<?php echo lang_get( 'update_prefs_button' ) ?>" />
+
+		<?php echo form_security_field( 'account_prefs_reset' ) ?>
+		<input type="submit" class="btn btn-primary btn-white btn-round"
+			   formaction="account_prefs_reset.php"
+			   value="<?php echo lang_get( 'reset_prefs_button' ) ?>" />
 	</div>
 	</form>
 	</div>
 	</div>
 </div>
-
-<div class="space-10"></div>
-
-<div id="account-prefs-reset-div" class="form-container">
-	<form id="account-prefs-reset-form" method="post" action="account_prefs_reset.php">
-		<fieldset>
-			<?php echo form_security_field( 'account_prefs_reset' ) ?>
-			<input type="hidden" name="user_id" value="<?php echo $p_user_id ?>" />
-			<input type="hidden" name="redirect_url" value="<?php echo $t_redirect_url ?>" />
-			<input type="submit" class="btn btn-primary btn-white btn-round" value="<?php echo lang_get( 'reset_prefs_button' ) ?>" />
-		</fieldset>
-	</form>
-</div>
 </div>
 
 <?php