1 files changed, 19 insertions, 0 deletions
diff --git a/phpBB/assets/javascript/installer.js b/phpBB/assets/javascript/installer.js
index 4a4f381844..0e54654ff1 100644
--- a/phpBB/assets/javascript/installer.js
+++ b/phpBB/assets/javascript/installer.js
@@ -12,6 +12,7 @@
 	var progressTimer = null;
 	var currentProgress = 0;
 	var refreshRequested = false;
+	var transmissionOver = false;
 
 	// Template related variables
 	var $contentWrapper = $('.install-body').find('.main');
@@ -329,6 +330,12 @@
 		if (responseObject.hasOwnProperty('redirect')) {
 			redirect(responseObject.redirect.url, responseObject.redirect.use_ajax);
 		}
+
+		if (responseObject.hasOwnProperty('over')) {
+			if (responseObject.over) {
+				transmissionOver = true;
+			}
+		}
 	}
 
 	/**
@@ -357,10 +364,21 @@
 			$('#loading_indicator').css('display', 'none');
 			resetPolling();
 
+			var timeoutDetected = !transmissionOver;
+
 			if (refreshRequested) {
 				refreshRequested = false;
 				doRefresh();
 			}
+
+			if (timeoutDetected) {
+				addMessage('error',
+					[{
+						title:'The installer detected a timeout.',
+						description: 'The installer has detected a timeout, you may try to refresh the page, that may lead to data corruption. We suggest that you either increase your timeout settings or try to use the CLI.'
+					}]
+				);
+			}
 		}
 	}
 
@@ -420,6 +438,7 @@
 	 */
 	function startPolling(xhReq) {
 		resetPolling();
+		transmissionOver = false;
 		pollTimer = setInterval(function () {
 			pollContent(xhReq);
 		}, 250);