Index: trunk/src/bp-groups/bp-groups-admin.php =================================================================== --- trunk/src/bp-groups/bp-groups-admin.php (revision 11530) +++ trunk/src/bp-groups/bp-groups-admin.php (revision 11556) @@ -237,17 +237,27 @@ $success_new = $error_new = $success_modified = $error_modified = array(); - // Group name and description are handled with - // groups_edit_base_group_details(). - if ( !groups_edit_base_group_details( $group_id, $_POST['bp-groups-name'], $_POST['bp-groups-description'], 0 ) ) { + // Name, description and slug must not be empty. + if ( empty( $_POST['bp-groups-name'] ) ) { + $error = $error - 1; + } + if ( empty( $_POST['bp-groups-description'] ) ) { + $error = $error - 2; + } + if ( empty( $_POST['bp-groups-slug'] ) ) { + $error = $error - 4; + } + + /* + * Group name, slug, and description are handled with + * groups_edit_base_group_details(). + */ + if ( ! $error && ! groups_edit_base_group_details( array( + 'group_id' => $group_id, + 'name' => $_POST['bp-groups-name'], + 'slug' => $_POST['bp-groups-slug'], + 'description' => $_POST['bp-groups-description'], + 'notify_members' => false, + ) ) ) { $error = $group_id; - - // Using negative integers for different error messages... eek! - if ( empty( $_POST['bp-groups-name'] ) && empty( $_POST['bp-groups-description'] ) ) { - $error = -3; - } elseif ( empty( $_POST['bp-groups-name'] ) ) { - $error = -1; - } elseif ( empty( $_POST['bp-groups-description'] ) ) { - $error = -2; - } } @@ -519,20 +529,8 @@ if ( ! empty( $errors ) ) { - switch ( $errors ) { - case -1 : - $messages[] = __( 'Group name cannot be empty.', 'buddypress' ); - break; - - case -2 : - $messages[] = __( 'Group description cannot be empty.', 'buddypress' ); - break; - - case -3 : - $messages[] = __( 'Group name and description cannot be empty.', 'buddypress' ); - break; - - default : - $messages[] = __( 'An error occurred when trying to update your group details.', 'buddypress' ); - break; + if ( $errors < 0 ) { + $messages[] = __( 'Group name, slug, and description are all required fields.', 'buddypress' ); + } else { + $messages[] = __( 'An error occurred when trying to update your group details.', 'buddypress' ); } @@ -613,5 +611,9 @@