hans/Nominatim
1
0
Fork 1
mirror of https://github.com/osm-search/Nominatim.git synced 2026-03-10 03:54:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

return a marginally better error message when query string is not in UTF-8,

Browse Source 
force UTF-8 in search formular
This commit is contained in:
Sarah Hoffmann
2012-02-12 12:01:24 +00:00
parent b07185c934
commit 6f9d3a9d80
2 changed files with 3 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/template/search-html.php
View File

@@ -317,7 +317,7 @@ form{
<div id="seachheaderfade1"></div><div id="seachheaderfade2"></div><div id="seachheaderfade3"></div><div id="seachheaderfade4"></div> <div id="seachheaderfade1"></div><div id="seachheaderfade2"></div><div id="seachheaderfade3"></div><div id="seachheaderfade4"></div>
<div id="seachheader"> <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%"> <table border="0" width="100%">
<tr> <tr>
<td valign="center" style="width:30px;"><img src="images/logo.gif"></td> <td valign="center" style="width:30px;"><img src="images/logo.gif"></td>

3
website/search.php
View File

@@ -271,7 +271,8 @@
$aPhrase = $oDB->getRow("select make_standard_name('".pg_escape_string($sPhrase)."') as string"); $aPhrase = $oDB->getRow("select make_standard_name('".pg_escape_string($sPhrase)."') as string");
if (PEAR::isError($aPhrase)) if (PEAR::isError($aPhrase))
{ {
var_dump($aPhrase); echo "Illegal query string (not an UTF-8 string): ".$sPhrase;
if (CONST_Debug) var_dump($aPhrase);
exit; exit;
} }
if (trim($aPhrase['string'])) if (trim($aPhrase['string']))