From: thepurpleblob <thepurpleblob>
Date: Wed, 7 Jan 2009 13:58:41 +0000 (+0000)
Subject: MDL-17048
X-Git-Url: http://git.mjollnir.org/gw?a=commitdiff_plain;h=17a99a133efb8932e54cba569eb5da4be52866c5;p=moodle.git

MDL-17048
Suppress display of empty custom profile field categories

Merged from STABLE19
---

diff --git a/user/profile/lib.php b/user/profile/lib.php
index fc4819d7db..3a1761aee4 100644
--- a/user/profile/lib.php
+++ b/user/profile/lib.php
@@ -72,7 +72,9 @@ class profile_field_base {
             $this->edit_field_set_default($mform);
             $this->edit_field_set_required($mform);
             $this->edit_field_set_locked($mform);
+            return true;
         }
+        return false;
     }
 
     /**
@@ -321,13 +323,17 @@ function profile_definition(&$mform) {
     if ($categories = $DB->get_records('user_info_category', null, 'sortorder ASC')) {
         foreach ($categories as $category) {
             if ($fields = $DB->get_records('user_info_field', array('categoryid'=>$category->id), 'sortorder ASC')) {
-                $mform->addElement('header', 'category_'.$category->id, format_string($category->name));
+                $displayed = false;
                 foreach ($fields as $field) {
                     require_once($CFG->dirroot.'/user/profile/field/'.$field->datatype.'/field.class.php');
                     $newfield = 'profile_field_'.$field->datatype;
                     $formfield = new $newfield($field->id);
-                    $formfield->edit_field($mform);
-
+                    if ($formfield->edit_field($mform)) {
+                        $displayed = true;
+                    }
+                }
+                if ($displayed) {
+                    $mform->addElement('header', 'category_'.$category->id, format_string($category->name));
                 }
             }
         }