From 13854e8774e4c2d95ef2359e26a4bbb42f0f1949 Mon Sep 17 00:00:00 2001
From: barisusakli <barisusakli@gmail.com>
Date: Thu, 19 Jun 2014 18:46:01 -0400
Subject: [PATCH] closes #1603

---
 public/language/en_GB/error.json | 1 +
 public/src/app.js                | 8 ++++++++
 public/src/modules/alerts.js     | 3 ++-
 src/middleware/middleware.js     | 2 +-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/public/language/en_GB/error.json b/public/language/en_GB/error.json
index 73ac0ad947..202454162d 100644
--- a/public/language/en_GB/error.json
+++ b/public/language/en_GB/error.json
@@ -3,6 +3,7 @@
 
 	"not-logged-in": "You don't seem to be logged in.",
 	"account-locked": "Your account has been locked temporarily",
+	"search-requires-login": "Searching requires an account! Please login or register!",
 
 	"invalid-cid": "Invalid Category ID",
 	"invalid-tid": "Invalid Topic ID",
diff --git a/public/src/app.js b/public/src/app.js
index ae260c15ab..a19de92132 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -468,6 +468,14 @@ var socket,
 		}
 
 		searchButton.off().on('click', function(e) {
+			if (!config.isLoggedIn && !config.allowGuestSearching) {
+				app.alert({
+					message:'[[error:search-requires-login]]',
+					timeout: 3000
+				});
+				ajaxify.go('login');
+				return false;
+			}
 			e.stopPropagation();
 
 			searchFields.removeClass('hide').show();
diff --git a/public/src/modules/alerts.js b/public/src/modules/alerts.js
index d4d9c83627..0308bcf97b 100644
--- a/public/src/modules/alerts.js
+++ b/public/src/modules/alerts.js
@@ -8,7 +8,8 @@ define('alerts', function() {
 	module.alert = function (params) {
 		params.alert_id = 'alert_button_' + (params.alert_id ? params.alert_id : new Date().getTime());
 		params.title = params.title || '';
-		params.location = (params.location || 'right-top');
+		params.location = params.location || 'right-top';
+		params.type = params.type || 'info';
 
 		var alert = $('#' + params.alert_id);
 		if (alert.length) {
diff --git a/src/middleware/middleware.js b/src/middleware/middleware.js
index 371cf21744..f670eef9b4 100644
--- a/src/middleware/middleware.js
+++ b/src/middleware/middleware.js
@@ -238,7 +238,7 @@ middleware.renderHeader = function(req, res, callback) {
 				csrf: res.locals.csrf_token,
 				navigation: custom_header.navigation,
 				allowRegistration: meta.config.allowRegistration === undefined || parseInt(meta.config.allowRegistration, 10) === 1,
-				searchEnabled: plugins.hasListeners('filter:search.query') && (uid || parseInt(meta.config.allowGuestSearching, 10) === 1)
+				searchEnabled: plugins.hasListeners('filter:search.query')
 			},
 			escapeList = {
 				'&': '&amp;',