Changeset 9321 for trunk/src/bp-groups/bp-groups-admin.php

Timestamp:

01/09/2015 12:24:15 AM (12 years ago)

Author:

r-a-y

Message:

Groups Admin: Add better contextual errors when editing a group.

Previously, when attempting to save an empty group title or description,
the error message was ambiguous, which could lead to confusing situations.

This commit addresses this (albeit in a workaround way - feel free to yell
at r-a-y for this one).

Fixes #5854.

File:

• trunk/src/bp-groups/bp-groups-admin.php (modified) (2 diffs)

trunk/src/bp-groups/bp-groups-admin.php

@@ -212 +212 @@
                 if ( !groups_edit_base_group_details( $group_id, $_POST['bp-groups-name'], $_POST['bp-groups-description'], 0 ) ) {
                         $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;
+                        }
                 }
 
@@ -456 +465 @@
 
                 if ( ! empty( $errors ) ) {
-                        $messages[] = __( 'An error occurred when trying to update your group details.', 'buddypress' );
+                        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;
+                        }
+
                 } elseif ( ! empty( $updated ) ) {
                         $messages[] = __( 'The group has been updated successfully.', 'buddypress' );