From 6f9d3a9d8004e3e9d40d07e9fd67fd9eaf6a7d4f Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Sun, 12 Feb 2012 12:01:24 +0000
Subject: [PATCH] return a marginally better error message when query string is
 not in UTF-8, force UTF-8 in search formular

---
 lib/template/search-html.php | 2 +-
 website/search.php           | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/lib/template/search-html.php b/lib/template/search-html.php
index a9d328a8..09b7021f 100644
--- a/lib/template/search-html.php
+++ b/lib/template/search-html.php
@@ -317,7 +317,7 @@ form{
 	<div id="seachheaderfade1"></div><div id="seachheaderfade2"></div><div id="seachheaderfade3"></div><div id="seachheaderfade4"></div>
 
 	<div id="seachheader">
-		<form action="<?php echo CONST_Website_BaseURL; ?>search.php" method="get">
+		<form accept-charset="UTF-8" action="<?php echo CONST_Website_BaseURL; ?>search.php" method="get">
 			<table border="0" width="100%">
 				<tr>
 					<td valign="center" style="width:30px;"><img src="images/logo.gif"></td>
diff --git a/website/search.php b/website/search.php
index 37ddd23c..f4b9b924 100755
--- a/website/search.php
+++ b/website/search.php
@@ -271,7 +271,8 @@
 				$aPhrase = $oDB->getRow("select make_standard_name('".pg_escape_string($sPhrase)."') as string");
 				if (PEAR::isError($aPhrase))
 				{
-					var_dump($aPhrase);
+					echo "Illegal query string (not an UTF-8 string): ".$sPhrase;
+					if (CONST_Debug) var_dump($aPhrase);
 					exit;
 				}
 				if (trim($aPhrase['string']))
-- 
2.39.5