Changeset 2645

Timestamp:

02/10/2010 03:24:26 PM (15 years ago)

Author:

apeatling

Message:

Fixes #1865

File:

• trunk/bp-xprofile.php (modified) (5 diffs)

trunk/bp-xprofile.php

@@ -299 +299 @@
         $posted_field_ids = explode( ',', $_POST['field_ids'] );
 
+        $is_required = array();
+
         /* Loop through the posted fields formatting any datebox values then validate the field */
         foreach ( (array)$posted_field_ids as $field_id ) {
@@ -315 +317 @@
             }
 
-            if ( xprofile_check_is_required_field( $field_id ) && empty( $_POST['field_' . $field_id] ) )
+            $is_required[$field_id] = xprofile_check_is_required_field( $field_id );
+            if ( $is_required[$field_id] && empty( $_POST['field_' . $field_id] ) )
                 $errors = true;
         }
@@ -327 +330 @@
             /* Now we've checked for required fields, lets save the values. */
             foreach ( (array)$posted_field_ids as $field_id ) {
-                if ( !xprofile_set_field_data( $field_id, $bp->displayed_user->id, $_POST['field_' . $field_id] ) )
+                if ( !xprofile_set_field_data( $field_id, $bp->displayed_user->id, $_POST['field_' . $field_id], $is_required[$field_id] ) )
                     $errors = true;
                 else
@@ -710 +713 @@
  * @return true on success, false on failure.
  */
-function xprofile_set_field_data( $field, $user_id, $value ) {
+function xprofile_set_field_data( $field, $user_id, $value, $is_required = false ) {
     if ( is_numeric( $field ) )
         $field_id = $field;
@@ -719 +722 @@
         return false;
 
-    if ( empty( $value ) || !strlen( trim( $value ) ) )
+    if ( $is_required && ( empty( $value ) || !strlen( trim( $value ) ) ) )
         return false;