From fcc144ca7472265e0ed7114f6d541c93715a051c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Raimund=20Schl=C3=BC=C3=9Fler?=
 <raimund.schluessler@googlemail.com>
Date: Sun, 8 Feb 2015 22:42:30 +0100
Subject: [PATCH 1/2] Append search results to custom container

fixes #13968
---
 core/search/js/search.js | 15 +++++++++++----
 1 file changed, 11 insertions(+), 4 deletions(-)

diff --git a/core/search/js/search.js b/core/search/js/search.js
index c6542ffc13..599a7c7d5c 100644
--- a/core/search/js/search.js
+++ b/core/search/js/search.js
@@ -360,10 +360,17 @@
 })();
 
 $(document).ready(function() {
-	var $searchResults = $('<div id="searchresults" class="hidden"/>');
-	$('#app-content')
-		.append($searchResults)
-		.find('.viewcontainer').css('min-height', 'initial');
+	var $searchResults = $('#searchresults');
+	if ($searchResults.length) {
+		$searchResults.addClass('hidden');
+		$('#app-content')
+			.find('.viewcontainer').css('min-height', 'initial');
+	} else {
+		var $searchResults = $('<div id="searchresults" class="hidden"/>');
+		$('#app-content')
+			.append($searchResults)
+			.find('.viewcontainer').css('min-height', 'initial');
+	}
 	$searchResults.load(OC.webroot + '/core/search/templates/part.results.html', function () {
 		OC.Search = new OCA.Search($('#searchbox'), $('#searchresults'));
 	});

From c398e8e42e5be84285c5e503d42991b36f79ab36 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Raimund=20Schl=C3=BC=C3=9Fler?=
 <raimund.schluessler@googlemail.com>
Date: Mon, 9 Feb 2015 07:52:10 +0100
Subject: [PATCH 2/2] Fix variable already defined

---
 core/search/js/search.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/core/search/js/search.js b/core/search/js/search.js
index 599a7c7d5c..42bdaf8835 100644
--- a/core/search/js/search.js
+++ b/core/search/js/search.js
@@ -366,7 +366,7 @@ $(document).ready(function() {
 		$('#app-content')
 			.find('.viewcontainer').css('min-height', 'initial');
 	} else {
-		var $searchResults = $('<div id="searchresults" class="hidden"/>');
+		$searchResults = $('<div id="searchresults" class="hidden"/>');
 		$('#app-content')
 			.append($searchResults)
 			.find('.viewcontainer').css('min-height', 'initial');