From f475068010f5db60ba9fc88760303e146cf76fa2 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Mon, 20 Jun 2016 13:39:08 +0300
Subject: [PATCH] closes #4759

---
 public/src/ajaxify.js | 11 ++++++++---
 public/src/app.js     |  3 ++-
 2 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/public/src/ajaxify.js b/public/src/ajaxify.js
index 4639acaeca..8d489d54a4 100644
--- a/public/src/ajaxify.js
+++ b/public/src/ajaxify.js
@@ -65,7 +65,7 @@ $(document).ready(function() {
 			app.previousUrl = window.location.href;
 		}
 
-		url = ajaxify.start(url, quiet);
+		url = ajaxify.start(url);
 
 		$('body').removeClass(ajaxify.data.bodyClass);
 		$('#footer, #content').removeClass('hide').addClass('ajaxifying');
@@ -75,6 +75,8 @@ $(document).ready(function() {
 				return onAjaxError(err, url, callback, quiet);
 			}
 
+			ajaxify.updateHistory(url, quiet);
+
 			retry = true;
 			app.template = data.template.name;
 
@@ -100,18 +102,21 @@ $(document).ready(function() {
 	};
 
 
-	ajaxify.start = function(url, quiet) {
+	ajaxify.start = function(url) {
 		url = ajaxify.removeRelativePath(url.replace(/^\/|\/$/g, ''));
 
 		$(window).trigger('action:ajaxify.start', {url: url});
 
+		return url;
+	};
+
+	ajaxify.updateHistory = function(url, quiet) {
 		ajaxify.currentPage = url.split(/[?#]/)[0];
 		if (window.history && window.history.pushState) {
 			window.history[!quiet ? 'pushState' : 'replaceState']({
 				url: url
 			}, url, RELATIVE_PATH + '/' + url);
 		}
-		return url;
 	};
 
 	function onAjaxError(err, url, callback, quiet) {
diff --git a/public/src/app.js b/public/src/app.js
index 93837d6e9a..c40fdc4a2a 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -26,7 +26,8 @@ app.cacheBuster = null;
 	app.load = function() {
 		app.loadProgressiveStylesheet();
 
-		var url = ajaxify.start(window.location.pathname.slice(1) + window.location.search + window.location.hash, true);
+		var url = ajaxify.start(window.location.pathname.slice(1) + window.location.search + window.location.hash);
+		ajaxify.updateHistory(url, true);
 		ajaxify.end(url, app.template);
 
 		handleStatusChange();