From 30059b1a5985fdfe1874e63f4bc5921080449151 Mon Sep 17 00:00:00 2001
From: Dries Buytaert <dries@buytaert.net>
Date: Sun, 13 Nov 2005 08:33:44 +0000
Subject: [PATCH] - Patch #34514 by darius: fixed forms API glitches.
---
modules/profile.module | 10 +++++-----
modules/profile/profile.module | 10 +++++-----
2 files changed, 10 insertions(+), 10 deletions(-)
diff --git a/modules/profile.module b/modules/profile.module
index d4d2fcb5cc20..dc626b8d0e07 100644
--- a/modules/profile.module
+++ b/modules/profile.module
@@ -349,12 +349,12 @@ function profile_form_profile($edit, $user, $category) {
$result = db_query("SELECT * FROM {profile_fields} WHERE LOWER(category) = LOWER('%s') ORDER BY weight", $category);
// We use LOWER('%s') instead of PHP's strtolower() to avoid UTF-8 conversion issues.
}
- // Only add form group if items exist
- if (db_num_rows($result)) {
- $fields[$category] = array('#type' => 'fieldset', '#title' => $category);
- }
+
while ($field = db_fetch_object($result)) {
$category = $field->category;
+ if (!isset($fields[$category])) {
+ $fields[$category] = array('#type' => 'fieldset', '#title' => $category, '#weight' => $w++);
+ }
switch ($field->type) {
case 'textfield':
case 'url':
@@ -380,7 +380,7 @@ function profile_form_profile($edit, $user, $category) {
$fields[$category][$field->name] = array('#type' => 'select', '#title' => check_plain($field->title), '#default_value' => $edit[$field->name], '#options' => $options, '#description' => _profile_form_explanation($field), '#required' => $field->required);
break;
case 'date':
- $fields[$category][$field->name] = array('#type' => 'date', '#title' => check_plain($field->title), '#default_value' => $edit[$field->name], description, '#description' => _profile_form_explanation($field), '#required' => $field->required);
+ $fields[$category][$field->name] = array('#type' => 'date', '#title' => check_plain($field->title), '#default_value' => $edit[$field->name], '#description' => _profile_form_explanation($field), '#required' => $field->required);
break;
}
}
diff --git a/modules/profile/profile.module b/modules/profile/profile.module
index d4d2fcb5cc20..dc626b8d0e07 100644
--- a/modules/profile/profile.module
+++ b/modules/profile/profile.module
@@ -349,12 +349,12 @@ function profile_form_profile($edit, $user, $category) {
$result = db_query("SELECT * FROM {profile_fields} WHERE LOWER(category) = LOWER('%s') ORDER BY weight", $category);
// We use LOWER('%s') instead of PHP's strtolower() to avoid UTF-8 conversion issues.
}
- // Only add form group if items exist
- if (db_num_rows($result)) {
- $fields[$category] = array('#type' => 'fieldset', '#title' => $category);
- }
+
while ($field = db_fetch_object($result)) {
$category = $field->category;
+ if (!isset($fields[$category])) {
+ $fields[$category] = array('#type' => 'fieldset', '#title' => $category, '#weight' => $w++);
+ }
switch ($field->type) {
case 'textfield':
case 'url':
@@ -380,7 +380,7 @@ function profile_form_profile($edit, $user, $category) {
$fields[$category][$field->name] = array('#type' => 'select', '#title' => check_plain($field->title), '#default_value' => $edit[$field->name], '#options' => $options, '#description' => _profile_form_explanation($field), '#required' => $field->required);
break;
case 'date':
- $fields[$category][$field->name] = array('#type' => 'date', '#title' => check_plain($field->title), '#default_value' => $edit[$field->name], description, '#description' => _profile_form_explanation($field), '#required' => $field->required);
+ $fields[$category][$field->name] = array('#type' => 'date', '#title' => check_plain($field->title), '#default_value' => $edit[$field->name], '#description' => _profile_form_explanation($field), '#required' => $field->required);
break;
}
}
--
GitLab