From 1d53127c2c1e2f25ec21b15a8304617512a088ea Mon Sep 17 00:00:00 2001
From: Kevin <kevin@breest.info>
Date: Sat, 9 Feb 2008 23:45:11 +0000
Subject: [PATCH] Report#62: Search box is still diplayed if search is disabled
 in board config - reported by Christian_N

---
 root/styles/prosilver/template/portal/block/main_menu.html | 2 ++
 root/styles/prosilver/template/portal/portal_body.html     | 2 +-
 templates/subsilver2/template/portal/block/main_menu.html  | 2 ++
 templates/subsilver2/template/portal/portal_body.html      | 2 +-
 4 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/root/styles/prosilver/template/portal/block/main_menu.html b/root/styles/prosilver/template/portal/block/main_menu.html
index 04203d57..16b97c3d 100644
--- a/root/styles/prosilver/template/portal/block/main_menu.html
+++ b/root/styles/prosilver/template/portal/block/main_menu.html
@@ -9,7 +9,9 @@
 				<strong>{L_M_CONTENT}</strong>
 				<ul>
 					<li><a href="{U_INDEX}">{L_INDEX}</a></li>
+					<!-- IF S_DISPLAY_SEARCH -->
 					<li><a href="{U_SEARCH}">{L_SEARCH}</a></li>
+					<!-- ENDIF -->
 					<!-- IF not S_USER_LOGGED_IN -->
 					<li><a href="{U_REGISTER}">{L_REGISTER}</a></li>
 					<!-- ENDIF -->
diff --git a/root/styles/prosilver/template/portal/portal_body.html b/root/styles/prosilver/template/portal/portal_body.html
index 5fce3d0b..6a2ab23a 100644
--- a/root/styles/prosilver/template/portal/portal_body.html
+++ b/root/styles/prosilver/template/portal/portal_body.html
@@ -19,7 +19,7 @@
 			<!-- INCLUDE portal/block/clock.html -->
 		<!-- ENDIF -->
 
-		<!-- IF S_DISPLAY_PORTALSEARCH -->
+		<!-- IF S_DISPLAY_PORTALSEARCH and S_DISPLAY_SEARCH -->
 			<!-- INCLUDE portal/block/search.html -->
 		<!-- ENDIF -->		
 		
diff --git a/templates/subsilver2/template/portal/block/main_menu.html b/templates/subsilver2/template/portal/block/main_menu.html
index 8d3e5a25..cd19da07 100644
--- a/templates/subsilver2/template/portal/block/main_menu.html
+++ b/templates/subsilver2/template/portal/block/main_menu.html
@@ -15,7 +15,9 @@
 	</tr>
 	<tr class="row1">
 		<td>
+			<!-- IF S_DISPLAY_SEARCH -->
 			<a href="{U_SEARCH}">{L_SEARCH}</a>
+			<!-- ENDIF -->
 		</td>
 	</tr>
 	<!-- IF not S_USER_LOGGED_IN -->
diff --git a/templates/subsilver2/template/portal/portal_body.html b/templates/subsilver2/template/portal/portal_body.html
index 24d51b47..b821797d 100644
--- a/templates/subsilver2/template/portal/portal_body.html
+++ b/templates/subsilver2/template/portal/portal_body.html
@@ -52,7 +52,7 @@ small, .small {
 			<!-- INCLUDE portal/block/clock.html -->
 		<!-- ENDIF -->
 
-		<!-- IF S_DISPLAY_PORTALSEARCH -->
+		<!-- IF S_DISPLAY_PORTALSEARCH and S_DISPLAY_SEARCH -->
 			<!-- INCLUDE portal/block/search.html -->
 		<!-- ENDIF -->