tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge branch '1091-Fixed-key-sensitive-search-in-agents-list-dev' into 'develop' 

Fixed search field in agents list

See merge request !650
This commit is contained in:
vgilc 2017-08-18 13:01:01 +02:00
parent 901a163c84 75b82847b0
commit 93c03da3fe
1 changed files with 2 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pandora_console/godmode/agentes/modificar_agente.php
View File

@ -180,8 +180,7 @@ echo "</tr></table>";
$order_collation = ""; $order_collation = "";
switch ($config["dbtype"]) { switch ($config["dbtype"]) {
case "mysql": case "mysql":
$order_collation = ""; $order_collation = "COLLATE utf8_general_ci";
//$order_collation = "COLLATE utf8_general_ci";
break; break;
case "postgresql": case "postgresql":
case "oracle": case "oracle":
@ -275,6 +274,7 @@ switch ($sortField) {
} }
$search_sql = ''; $search_sql = '';
if ($search != "") { if ($search != "") {
$sql = "SELECT DISTINCT taddress_agent.id_agent FROM taddress $sql = "SELECT DISTINCT taddress_agent.id_agent FROM taddress
INNER JOIN taddress_agent ON INNER JOIN taddress_agent ON