From e66a3ad1f5734fa77b5d628b53dfbc8d8fa36925 Mon Sep 17 00:00:00 2001
From: emanuele <emanuele45@gmail.com>
Date: Sun, 26 Jul 2015 23:52:53 +0200
Subject: [PATCH] Fix editing of agreement in different languages - fixes #2155
 thanks winstar for reporting

Signed-off-by: emanuele <emanuele45@gmail.com>
---
 .../admin/ManageRegistration.controller.php   |  2 +-
 themes/default/Register.template.php          | 26 +++++++++----------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/sources/admin/ManageRegistration.controller.php b/sources/admin/ManageRegistration.controller.php
index 94476a23a5..a8e36f1a40 100644
--- a/sources/admin/ManageRegistration.controller.php
+++ b/sources/admin/ManageRegistration.controller.php
@@ -235,7 +235,7 @@ public function action_agreement()
 			}
 		}
 
-		if (isset($_POST['agreement']))
+		if (isset($_POST['save']) && isset($_POST['agreement']))
 		{
 			checkSession();
 			validateToken('admin-rega');
diff --git a/themes/default/Register.template.php b/themes/default/Register.template.php
index 2fb3e83539..5a767e0fd9 100644
--- a/themes/default/Register.template.php
+++ b/themes/default/Register.template.php
@@ -683,7 +683,8 @@ function template_edit_agreement()
 
 	echo '
 			<div class="windowbg2" id="registration_agreement">
-				<div class="content">';
+				<div class="content">
+					<input type="hidden" name="agree_lang" value="', $context['current_agreement'], '" />';
 
 	// Is there more than one language to choose from?
 	if (count($context['editable_agreements']) > 1)
@@ -691,22 +692,20 @@ function template_edit_agreement()
 		echo '
 					<h3 class="category_header">', $txt['language_configuration'], '</h3>
 					<div class="information">
-						<form action="', $scripturl, '?action=admin;area=regcenter" id="change_reg" method="post" accept-charset="UTF-8" style="display: inline;">
-							<strong>', $txt['admin_agreement_select_language'], ':</strong>&nbsp;
-							<select name="agree_lang" onchange="document.getElementById(\'change_reg\').submit();" tabindex="', $context['tabindex']++, '">';
+						<strong>', $txt['admin_agreement_select_language'], ':</strong>&nbsp;
+						<select name="agree_lang" onchange="document.getElementById(\'admin_form_wrapper\').submit();" tabindex="', $context['tabindex']++, '">';
 
 		foreach ($context['editable_agreements'] as $file => $name)
 			echo '
-								<option value="', $file, '" ', $context['current_agreement'] == $file ? 'selected="selected"' : '', '>', $name, '</option>';
+							<option value="', $file, '" ', $context['current_agreement'] == $file ? 'selected="selected"' : '', '>', $name, '</option>';
 
 		echo '
-							</select>
-							<div class="submitbutton">
-								<input type="hidden" name="sa" value="agreement" />
-								<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
-								<input type="submit" name="change" value="', $txt['admin_agreement_select_language_change'], '" tabindex="', $context['tabindex']++, '" class="button_submit" />
-							</div>
-						</form>
+						</select>
+						<div class="submitbutton">
+							<input type="hidden" name="sa" value="agreement" />
+							<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
+							<input type="submit" name="change" value="', $txt['admin_agreement_select_language_change'], '" tabindex="', $context['tabindex']++, '" class="button_submit" />
+						</div>
 					</div>';
 	}
 
@@ -721,8 +720,7 @@ function template_edit_agreement()
 						<label for="checkboxAgreement"><input type="checkbox" name="checkboxAgreement" id="checkboxAgreement"', $context['checkbox_agreement'] ? ' checked="checked"' : '', ' tabindex="', $context['tabindex']++, '" value="1" class="input_check" /> ', $txt['admin_checkbox_agreement'], '.</label>
 					</p>
 					<div class="submitbutton" >
-						<input type="submit" value="', $txt['save'], '" tabindex="', $context['tabindex']++, '" class="button_submit" />
-						<input type="hidden" name="agree_lang" value="', $context['current_agreement'], '" />
+						<input type="submit" name="save" value="', $txt['save'], '" tabindex="', $context['tabindex']++, '" class="button_submit" />
 						<input type="hidden" name="sa" value="agreement" />
 						<input type="hidden" name="', $context['session_var'], '" value="', $context['session_id'], '" />
 						<input type="hidden" name="', $context['admin-rega_token_var'], '" value="', $context['admin-rega_token'], '" />