From 1c21ca78dcc3bc1e38614fb52d1e11169ff02581 Mon Sep 17 00:00:00 2001
From: Julian Lam <julian@designcreateplay.com>
Date: Mon, 24 Nov 2014 12:38:44 -0500
Subject: [PATCH] preventing ctrl-f hijacking if no search plugin is installed

---
 public/src/app.js      | 4 +++-
 src/controllers/api.js | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/public/src/app.js b/public/src/app.js
index 09828f14c1..9dc3f17579 100644
--- a/public/src/app.js
+++ b/public/src/app.js
@@ -539,7 +539,9 @@ var socket,
 
 			handleStatusChange();
 
-			handleSearch();
+			if (config.searchEnabled) {
+				handleSearch();
+			}
 
 			$('#logout-link').on('click', app.logout);
 
diff --git a/src/controllers/api.js b/src/controllers/api.js
index e6c5d478c1..083126fa08 100644
--- a/src/controllers/api.js
+++ b/src/controllers/api.js
@@ -53,6 +53,7 @@ apiController.getConfig = function(req, res, next) {
 	config.requireEmailConfirmation = parseInt(meta.config.requireEmailConfirmation, 10) === 1;
 	config.topicPostSort = meta.config.topicPostSort || 'oldest_to_newest';
 	config.csrf_token = req.csrfToken();
+	config.searchEnabled = plugins.hasListeners('filter:search.query');
 
 	if (!req.user) {
 		if (res.locals.isAPI) {