diff --git a/application/controllers/Gridmap.php b/application/controllers/Gridmap.php index 075906269..922e987c2 100644 --- a/application/controllers/Gridmap.php +++ b/application/controllers/Gridmap.php @@ -173,7 +173,7 @@ class Gridmap extends CI_Controller { } } - $data['grid_2char_confirmed'] = ($array_grid_2char_confirmed); + $data['grid_2char_confirmed'] = ($array_grid_2char_confirmed); $data['grid_4char_confirmed'] = ($array_grid_4char_confirmed); $data['grid_6char_confirmed'] = ($array_grid_6char_confirmed); diff --git a/application/models/Gridmap_model.php b/application/models/Gridmap_model.php index 067545c3a..98bd829c1 100644 --- a/application/models/Gridmap_model.php +++ b/application/models/Gridmap_model.php @@ -129,6 +129,7 @@ class Gridmap_model extends CI_Model { return null; } + $location_list = "'".implode("','",$logbooks_locations_array)."'"; $sql = 'SELECT distinct COL_VUCC_GRIDS, COL_BAND FROM ' @@ -177,7 +178,10 @@ class Gridmap_model extends CI_Model { $sql .= " or col_qrzcom_qso_download_status = 'Y'"; } if ($sql != '') { - $sql='and (1=0 '.$sql.')'; + $sql=' and (1=0 '.$sql.')'; + } + if ($sql == '') { + $sql=' and 1=0'; } return $sql; }