summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorGerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org>2006-04-11 13:02:04 +0000
committerGerhard Killesreiter <killes_www_drop_org@227.no-reply.drupal.org>2006-04-11 13:02:04 +0000
commitbadeac698c7615409e028c0b44642cb17f75c0b1 (patch)
treeab1da8c2328ae7230ea3e20797181aa8bdee0f5e
parent70aae83c8ee2a44b2eb880214af50f8052e12bf7 (diff)
downloadbrdo-badeac698c7615409e028c0b44642cb17f75c0b1.tar.gz
brdo-badeac698c7615409e028c0b44642cb17f75c0b1.tar.bz2
#58239, required profile list not required, patch by Dries K
-rw-r--r--modules/profile.module4
-rw-r--r--modules/profile/profile.module4
2 files changed, 6 insertions, 2 deletions
diff --git a/modules/profile.module b/modules/profile.module
index 48c8e1aa9..64814694e 100644
--- a/modules/profile.module
+++ b/modules/profile.module
@@ -660,7 +660,9 @@ function profile_form_profile($edit, $user, $category) {
);
break;
case 'selection':
- $options = array('--');
+ if (!$field->required) {
+ $options = array('--');
+ }
$lines = split("[,\n\r]", $field->options);
foreach ($lines as $line) {
if ($line = trim($line)) {
diff --git a/modules/profile/profile.module b/modules/profile/profile.module
index 48c8e1aa9..64814694e 100644
--- a/modules/profile/profile.module
+++ b/modules/profile/profile.module
@@ -660,7 +660,9 @@ function profile_form_profile($edit, $user, $category) {
);
break;
case 'selection':
- $options = array('--');
+ if (!$field->required) {
+ $options = array('--');
+ }
$lines = split("[,\n\r]", $field->options);
foreach ($lines as $line) {
if ($line = trim($line)) {