Merge remote-tracking branch 'upstream/dev' into fix_dxcc_in_search_result

application/controllers/Logbook.php

@@ -886,8 +886,8 @@ class Logbook extends CI_Controller {
 				if (isset($callsign['callsign']['error'])) {
 					$callsign['error'] = $callsign['callsign']['error'];
 				}
-				$callsign['id'] = strtoupper($id);
 
+				$callsign['id'] = strtoupper($id);
 				return $this->load->view('search/result', $callsign, true);
 		}
 	}

application/views/search/result.php

@@ -22,10 +22,12 @@
 	<td style="padding: 0.3em 0 0.3em 0.5em;" align="left"><?php echo $callsign['city']; ?></td>
 </tr>
 
+<?php if(isset($callsign['dxcc_name'])) { ?>
 <tr>
 	<td style="padding: 0 0.3em 0 0;" align="left">DXCC</td>
 	<td style="padding: 0.3em 0 0.3em 0.5em;" align="left"><?php echo $callsign['dxcc_name']; ?></td>
 </tr>
+<?php } ?>
 
 <tr>
 	<td style="padding: 0 0.3em 0 0;" align="left">Gridsquare</td>