From 5aa35bbbf8d9d72c1a2c304d3582a93c15fb40f6 Mon Sep 17 00:00:00 2001 From: Kyle Mathews Date: Fri, 21 Oct 2011 15:02:01 -0700 Subject: [PATCH] Fix for #1314970. Don't generate a date string if the date is NULL or 0. --- .../fhd_person_mapping/fhd_person_mapping.module | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/fhd_person/fhd_person_mapping/fhd_person_mapping.module b/fhd_person/fhd_person_mapping/fhd_person_mapping.module index 8a7916a..0ac5bbd 100644 --- a/fhd_person/fhd_person_mapping/fhd_person_mapping.module +++ b/fhd_person/fhd_person_mapping/fhd_person_mapping.module @@ -61,8 +61,12 @@ function template_preprocess_fhd_person_mapping_block(&$vars) { $person = $vars['person']; $vars['person_link'] = l($person->name, 'person/' . $person->pid); - $vars['birth_string'] = adodb_date('Y', $person->birth_date) . ' ' . check_plain($person->birth_place); - $vars['death_string'] = adodb_date('Y', $person->death_date) . ' ' . check_plain($person->death_place); + if (!empty($person->birth_date)) { + $vars['birth_string'] = adodb_date('Y', $person->birth_date) . ' ' . check_plain($person->birth_place); + } + if (!empty($person->death_date)) { + $vars['death_string'] = adodb_date('Y', $person->death_date) . ' ' . check_plain($person->death_place); + } } function _fhd_person_mapping_ajax_callback() { @@ -78,7 +82,7 @@ function _fhd_person_mapping_ajax_callback() { } /** - * @todo Create a searchable column so we can do fulltext search. + * @todo Create a searchable column so we can do fulltext search. http://drupal.org/node/1317404 **/ function _fhd_person_mapping_autocomplete($string) { $matches = array();