3 files changed, 18 insertions, 11 deletions
diff --git a/phpBB/docs/CHANGELOG.html b/phpBB/docs/CHANGELOG.html
index b8003d6daa..17b5a2632c 100644
--- a/phpBB/docs/CHANGELOG.html
+++ b/phpBB/docs/CHANGELOG.html
@@ -53,6 +53,7 @@
 <ol>
 	<li><a href="#changelog">Changelog</a>
 	<ol style="list-style-type: lower-roman;">
+		<li><a href="#v30rc6">Changes since RC-6</a></li>
 		<li><a href="#v30rc5">Changes since RC-5</a></li>
 		<li><a href="#v30rc4">Changes since RC-4</a></li>
 		<li><a href="#v30rc3">Changes since RC-3</a></li>
@@ -77,7 +78,13 @@
 
 		<div class="content">
 
-	<a name="v30rc5"></a><h3>1.i. Changes since 3.0.RC5</h3>
+	<a name="v30rc6"></a><h3>1.i. Changes since 3.0.RC6</h3>
+
+	<ul>
+		<li>[Fix] Submitting language changes using acp_language (Bug #14736)</li>
+	</ul>
+
+	<a name="v30rc5"></a><h3>1.ii. Changes since 3.0.RC5</h3>
 
 	<ul>
 		<li>[Feature] Removing constant PHPBB_EMBEDDED in favor of using an exit_handler(); the constant was meant to achive this more or less.</li>
@@ -140,7 +147,7 @@
 		<li>[Sec] New password hashing mechanism for storing passwords (#i42)</li>
 	</ul>
 
-	<a name="v30rc4"></a><h3>1.ii. Changes since 3.0.RC4</h3>
+	<a name="v30rc4"></a><h3>1.iii. Changes since 3.0.RC4</h3>
 
 	<ul>
 		<li>[Fix] MySQL, PostgreSQL and SQLite related database fixes (Bug #13862)</li>
@@ -191,7 +198,7 @@
 		<li>[Fix] odbc_autocommit causing existing result sets to be dropped (Bug #14182)</li>
 	</ul>
 
-	<a name="v30rc3"></a><h3>1.iii. Changes since 3.0.RC3</h3>
+	<a name="v30rc3"></a><h3>1.iv. Changes since 3.0.RC3</h3>
 
 	<ul>
 		<li>[Fix] Fixing some subsilver2 and prosilver style issues</li>
@@ -300,7 +307,7 @@
 
 	</ul>
 
-	<a name="v30rc2"></a><h3>1.iv. Changes since 3.0.RC2</h3>
+	<a name="v30rc2"></a><h3>1.v. Changes since 3.0.RC2</h3>
 
 	<ul>
 		<li>[Fix] Re-allow searching within the memberlist</li>
@@ -346,7 +353,7 @@
 
 	</ul>
 
-	<a name="v30rc1"></a><h3>1.v. Changes since 3.0.RC1</h3>
+	<a name="v30rc1"></a><h3>1.vi. Changes since 3.0.RC1</h3>
 
 	<ul>
 		<li>[Fix] (X)HTML issues within the templates (Bug #11255, #11255)</li>
diff --git a/phpBB/includes/acp/acp_language.php b/phpBB/includes/acp/acp_language.php
index f68b3ea287..2af6d90284 100644
--- a/phpBB/includes/acp/acp_language.php
+++ b/phpBB/includes/acp/acp_language.php
@@ -42,11 +42,11 @@ class acp_language
 		// Check and set some common vars
 
 		$action		= (isset($_POST['update_details'])) ? 'update_details' : '';
-		$action		= (isset($_POST['download_file'])) ? 'download_file' : '';
-		$action		= (isset($_POST['upload_file'])) ? 'upload_file' : '';
-		$action		= (isset($_POST['upload_data'])) ? 'upload_data' : '';
-		$action		= (isset($_POST['submit_file'])) ? 'submit_file' : '';
-		$action		= (isset($_POST['remove_store'])) ? 'details' : '';
+		$action		= (isset($_POST['download_file'])) ? 'download_file' : $action;
+		$action		= (isset($_POST['upload_file'])) ? 'upload_file' : $action;
+		$action		= (isset($_POST['upload_data'])) ? 'upload_data' : $action;
+		$action		= (isset($_POST['submit_file'])) ? 'submit_file' : $action;
+		$action		= (isset($_POST['remove_store'])) ? 'details' : $action;
 
 		$submit = (empty($action)) ? false : true;
 		$action = (empty($action)) ? request_var('action', '') : $action;
diff --git a/phpBB/install/schemas/schema_data.sql b/phpBB/install/schemas/schema_data.sql
index 64f947783c..455e2f7e3f 100644
--- a/phpBB/install/schemas/schema_data.sql
+++ b/phpBB/install/schemas/schema_data.sql
@@ -213,7 +213,7 @@ INSERT INTO phpbb_config (config_name, config_value) VALUES ('topics_per_page',
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('tpl_allow_php', '0');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_icons_path', 'images/upload_icons');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('upload_path', 'files');
-INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.RC6');
+INSERT INTO phpbb_config (config_name, config_value) VALUES ('version', '3.0.RC7-dev');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_expire_days', '90');
 INSERT INTO phpbb_config (config_name, config_value) VALUES ('warnings_gc', '14400');