From cb21c33a14937a87551a0b39c2f814dca187a134 Mon Sep 17 00:00:00 2001
From: Vjacheslav Trushkin <cyberalien@gmail.com>
Date: Fri, 27 Sep 2013 16:56:06 +0300
Subject: [PATCH 1/3] [ticket/11872] Template syntax typos in oauth templates

PHPBB3-11872
---
 phpBB/styles/prosilver/template/ucp_auth_link_oauth.html  | 2 +-
 phpBB/styles/subsilver2/template/ucp_auth_link_oauth.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html b/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html
index a3e27328cd..18316613b0 100644
--- a/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html
+++ b/phpBB/styles/prosilver/template/ucp_auth_link_oauth.html
@@ -20,7 +20,7 @@
 					<dt>&nbsp;</dt>
 					<dd><input type="submit" name="submit" tabindex="6" value="{L_UCP_AUTH_LINK_LINK}" class="button1" /></dd>
 				</dl>
-			<!-- ENDIF-->
+			<!-- ENDIF -->
 		</fieldset>
 		{oauth.HIDDEN_FIELDS}
 		{S_HIDDEN_FIELDS}
diff --git a/phpBB/styles/subsilver2/template/ucp_auth_link_oauth.html b/phpBB/styles/subsilver2/template/ucp_auth_link_oauth.html
index 56a4c89125..80564d207b 100644
--- a/phpBB/styles/subsilver2/template/ucp_auth_link_oauth.html
+++ b/phpBB/styles/subsilver2/template/ucp_auth_link_oauth.html
@@ -23,7 +23,7 @@
 						<tr>
 							<td class="row1"><input type="submit" name="submit" tabindex="6" value="{L_UCP_AUTH_LINK_LINK}" class="button1" /></td>
 						</tr>
-					<!-- ENDIF-->
+					<!-- ENDIF -->
 				</table>
 				{oauth.HIDDEN_FIELDS}
 				{S_HIDDEN_FIELDS}

From 7ab90c6c828a512662a323f1401f39766d3d6f8d Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Wed, 23 Oct 2013 22:32:37 -0700
Subject: [PATCH 2/3] [ticket/11138] Increase AJAX timeout period to 15
 seconds.

PHPBB3-11138
---
 phpBB/assets/javascript/core.js | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/phpBB/assets/javascript/core.js b/phpBB/assets/javascript/core.js
index ab0891e70c..7bd3b85d7d 100644
--- a/phpBB/assets/javascript/core.js
+++ b/phpBB/assets/javascript/core.js
@@ -27,12 +27,12 @@ phpbb.loadingAlert = function() {
 	} else {
 		loadingAlert.show();
 		dark.fadeIn(phpbb.alertTime, function() {
-			// Wait five seconds and display an error if nothing has been returned by then.
+			// Wait fifteen seconds and display an error if nothing has been returned by then.
 			phpbbAlertTimer = setTimeout(function() {
 				if (loadingAlert.is(':visible')) {
 					phpbb.alert($('#phpbb_alert').attr('data-l-err'), $('#phpbb_alert').attr('data-l-timeout-processing-req'));
 				}
-			}, 5000);
+			}, 15000);
 		});
 	}
 

From 963dbed106bf4662fe5317baf1c56e901a3d7ba6 Mon Sep 17 00:00:00 2001
From: Cesar G <prototech91@gmail.com>
Date: Wed, 23 Oct 2013 22:47:44 -0700
Subject: [PATCH 3/3] [ticket/11138] Do not use AJAX for ACP resync features.

PHPBB3-11138
---
 phpBB/adm/style/acp_main.html | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/phpBB/adm/style/acp_main.html b/phpBB/adm/style/acp_main.html
index b644862ce1..d9e7fb7eeb 100644
--- a/phpBB/adm/style/acp_main.html
+++ b/phpBB/adm/style/acp_main.html
@@ -168,21 +168,21 @@
 				</dl>
 			</form>
 
-			<form id="action_stats_form" method="post" action="{U_ACTION}" data-ajax="true">
+			<form id="action_stats_form" method="post" action="{U_ACTION}">
 				<dl>
 					<dt><label for="action_stats">{L_RESYNC_STATS}</label><br /><span>{L_RESYNC_STATS_EXPLAIN}</span></dt>
 					<dd><input type="hidden" name="action" value="stats" /><input class="button2" type="submit" id="action_stats" name="action_stats" value="{L_RUN}" /></dd>
 				</dl>
 			</form>
 
-			<form id="action_user_form" method="post" action="{U_ACTION}" data-ajax="true">
+			<form id="action_user_form" method="post" action="{U_ACTION}">
 				<dl>
 					<dt><label for="action_user">{L_RESYNC_POSTCOUNTS}</label><br /><span>{L_RESYNC_POSTCOUNTS_EXPLAIN}</span></dt>
 					<dd><input type="hidden" name="action" value="user" /><input class="button2" type="submit" id="action_user" name="action_user" value="{L_RUN}" /></dd>
 				</dl>
 			</form>
 
-			<form id="action_db_track_form" method="post" action="{U_ACTION}" data-ajax="true">
+			<form id="action_db_track_form" method="post" action="{U_ACTION}">
 				<dl>
 					<dt><label for="action_db_track">{L_RESYNC_POST_MARKING}</label><br /><span>{L_RESYNC_POST_MARKING_EXPLAIN}</span></dt>
 					<dd><input type="hidden" name="action" value="db_track" /><input class="button2" type="submit" id="action_db_track" name="action_db_track" value="{L_RUN}" /></dd>