From 1f5b3ba6362ed54f6c46d95b4ba3ea49966a1fb0 Mon Sep 17 00:00:00 2001
From: Baris Usakli <barisusakli@gmail.com>
Date: Fri, 23 Jun 2017 15:57:23 -0400
Subject: [PATCH] closes #5771

---
 public/src/client/search.js | 7 +++----
 src/controllers/search.js   | 4 +++-
 src/search.js               | 2 --
 3 files changed, 6 insertions(+), 7 deletions(-)

diff --git a/public/src/client/search.js b/public/src/client/search.js
index e6691e626e..515f7030b5 100644
--- a/public/src/client/search.js
+++ b/public/src/client/search.js
@@ -7,8 +7,6 @@ define('forum/search', ['search', 'autocomplete', 'storage'], function (searchMo
 	Search.init = function () {
 		var searchQuery = $('#results').attr('data-search-query');
 
-		$('#search-input').val(searchQuery);
-
 		var searchIn = $('#search-in');
 
 		searchIn.on('change', function () {
@@ -62,12 +60,13 @@ define('forum/search', ['search', 'autocomplete', 'storage'], function (searchMo
 
 	function fillOutForm() {
 		var params = utils.params();
+
 		var searchData = searchModule.getSearchPreferences();
 		var formData = utils.merge(searchData, params);
 
 		if (formData) {
-			if (params.term) {
-				$('#search-input').val(params.term);
+			if (ajaxify.data.term) {
+				$('#search-input').val(ajaxify.data.term);
 			}
 
 			if (formData.in) {
diff --git a/src/controllers/search.js b/src/controllers/search.js
index 309f77f557..f02a61dc31 100644
--- a/src/controllers/search.js
+++ b/src/controllers/search.js
@@ -2,6 +2,7 @@
 'use strict';
 
 var async = require('async');
+var validator = require('validator');
 
 var meta = require('../meta');
 var plugins = require('../plugins');
@@ -68,7 +69,8 @@ searchController.search = function (req, res, next) {
 		searchData.breadcrumbs = helpers.buildBreadcrumbs([{ text: '[[global:search]]' }]);
 		searchData.expandSearch = !req.query.term;
 		searchData.searchDefaultSortBy = meta.config.searchDefaultSortBy || '';
-
+		searchData.search_query = validator.escape(String(req.query.term || ''));
+		searchData.term = req.query.term;
 		res.render('search', searchData);
 	});
 };
diff --git a/src/search.js b/src/search.js
index 3ed7f4ef35..599bd66c09 100644
--- a/src/search.js
+++ b/src/search.js
@@ -1,7 +1,6 @@
 'use strict';
 
 var async = require('async');
-var validator = require('validator');
 
 var db = require('./database');
 var posts = require('./posts');
@@ -31,7 +30,6 @@ search.search = function (data, callback) {
 			}
 		},
 		function (result, next) {
-			result.search_query = validator.escape(String(data.query || ''));
 			result.time = (process.elapsedTimeSince(start) / 1000).toFixed(2);
 			next(null, result);
 		},