From 4a7030e0e5867b89352aabf7d3e112335400fcbd Mon Sep 17 00:00:00 2001 From: ikawhero Date: Wed, 18 Apr 2007 02:10:15 +0000 Subject: [PATCH] Changes merged from 1.8 Fix for MDL-9415 New method is_empty() added. --- user/profile/lib.php | 10 +++++++++- 1 file changed, 9 insertions(+), 1 deletion(-) diff --git a/user/profile/lib.php b/user/profile/lib.php index 6b9a19acc3639..bb0062776a5aa 100644 --- a/user/profile/lib.php +++ b/user/profile/lib.php @@ -223,6 +223,14 @@ function is_visible() { } } + /** + * Check if the field data is considered empty + * return boolean + */ + function is_empty() { + return ( ($this->data != '0') and empty($this->data)); + } + /** * Check if the field is required on the edit profile page * @return boolean @@ -332,7 +340,7 @@ function profile_display_fields($userid) { require_once($CFG->dirroot.'/user/profile/field/'.$field->datatype.'/field.class.php'); $newfield = 'profile_field_'.$field->datatype; $formfield = new $newfield($field->id, $userid); - if ($formfield->is_visible() and ($formfield->data !== NULL)) { + if ($formfield->is_visible() and !$formfield->is_empty()) { print_row(s($formfield->field->name.':'), $formfield->display_data()); } }