Changeset 9315

Timestamp:

01/08/2015 09:43:47 PM (10 years ago)

Author:

johnjamesjacoby

Message:

s/else if/elseif/

"The keyword elseif should be used instead of else if so that all control keywords look like single words."

Props wonderboymusic, hnla. See #6097.

Location:

trunk/src

Files:

• bp-activity/bp-activity-actions.php (modified) (3 diffs)
• bp-activity/bp-activity-classes.php (modified) (2 diffs)
• bp-activity/bp-activity-template.php (modified) (2 diffs)
• bp-core/bp-core-avatars.php (modified) (10 diffs)
• bp-core/bp-core-buddybar.php (modified) (1 diff)
• bp-core/bp-core-catchuri.php (modified) (1 diff)
• bp-core/bp-core-classes.php (modified) (6 diffs)
• bp-core/bp-core-cssjs.php (modified) (2 diffs)
• bp-core/bp-core-filters.php (modified) (1 diff)
• bp-core/bp-core-functions.php (modified) (2 diffs)
• bp-core/bp-core-theme-compatibility.php (modified) (1 diff)
• bp-friends/bp-friends-actions.php (modified) (2 diffs)
• bp-friends/bp-friends-template.php (modified) (1 diff)
• bp-groups/bp-groups-actions.php (modified) (2 diffs)
• bp-groups/bp-groups-activity.php (modified) (1 diff)
• bp-groups/bp-groups-admin.php (modified) (4 diffs)
• bp-groups/bp-groups-classes.php (modified) (3 diffs)
• bp-groups/bp-groups-functions.php (modified) (1 diff)
• bp-groups/bp-groups-loader.php (modified) (2 diffs)
• bp-groups/bp-groups-screens.php (modified) (11 diffs)
• bp-groups/bp-groups-template.php (modified) (5 diffs)
• bp-groups/bp-groups-widgets.php (modified) (2 diffs)
• bp-members/bp-members-admin.php (modified) (3 diffs)
• bp-members/bp-members-functions.php (modified) (2 diffs)
• bp-members/bp-members-template.php (modified) (2 diffs)
• bp-messages/bp-messages-classes.php (modified) (1 diff)
• bp-messages/bp-messages-screens.php (modified) (2 diffs)
• bp-messages/bp-messages-template.php (modified) (1 diff)
• bp-templates/bp-legacy/buddypress-functions.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-admin.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-classes.php (modified) (9 diffs)

trunk/src/bp-activity/bp-activity-actions.php

@@ -92 +92 @@
 
     // Set redirect to users' activity stream
-    } else if ( ! empty( $activity->user_id ) ) {
+    } elseif ( ! empty( $activity->user_id ) ) {
         $redirect = bp_core_get_user_domain( $activity->user_id, $activity->user_nicename, $activity->user_login ) . bp_get_activity_slug() . '/' . $activity->id . '/';
     }
@@ -340 +340 @@
 
     // Post to groups object
-    } else if ( 'groups' == $object && bp_is_active( 'groups' ) ) {
+    } elseif ( 'groups' == $object && bp_is_active( 'groups' ) ) {
         if ( (int) $item_id ) {
             $activity_id = groups_post_update( array( 'content' => $content, 'group_id' => $item_id ) );
@@ -812 +812 @@
 
     // Unpublishing a previously published post.
-    } else if ( 'publish' === $old_status ) {
+    } elseif ( 'publish' === $old_status ) {
         // Some form of pending status - only remove the activity entry
         bp_activity_post_type_unpublish( $post->ID, $post );

trunk/src/bp-activity/bp-activity-classes.php

@@ -170 +170 @@
         // If no callback is available, use the literal string from
         // the database row
-        } else if ( ! empty( $row->action ) ) {
+        } elseif ( ! empty( $row->action ) ) {
             $this->action = $row->action;
 
@@ -1278 +1278 @@
 
         // A true cache miss
-        } else if ( empty( $comments ) ) {
+        } elseif ( empty( $comments ) ) {
 
             // Select the user's fullname with the query

trunk/src/bp-activity/bp-activity-template.php

@@ -653 +653 @@
     if ( isset( $_GET['afilter'] ) && apply_filters( 'bp_activity_enable_afilter_support', false ) )
         $filter = array( 'object' => $_GET['afilter'] );
-    else if ( ! empty( $user_id ) || ! empty( $object ) || ! empty( $action ) || ! empty( $primary_id ) || ! empty( $secondary_id ) || ! empty( $offset ) || ! empty( $since ) )
+    elseif ( ! empty( $user_id ) || ! empty( $object ) || ! empty( $action ) || ! empty( $primary_id ) || ! empty( $secondary_id ) || ! empty( $offset ) || ! empty( $since ) )
         $filter = array( 'user_id' => $user_id, 'object' => $object, 'action' => $action, 'primary_id' => $primary_id, 'secondary_id' => $secondary_id, 'offset' => $offset, 'since' => $since );
     else
@@ -4309 +4309 @@
 
             // On individual group pages, default to 'group'
-            } else if ( bp_is_active( 'groups' ) && bp_is_group() ) {
+            } elseif ( bp_is_active( 'groups' ) && bp_is_group() ) {
                 $context = 'group';
 

trunk/src/bp-core/bp-core-avatars.php

@@ -316 +316 @@
     if ( false !== $params['width'] ) {
         // Width has been specified. No modification necessary.
-    } else if ( 'thumb' == $params['type'] ) {
+    } elseif ( 'thumb' == $params['type'] ) {
         $params['width'] = bp_core_avatar_thumb_width();
     } else {
@@ -326 +326 @@
     if ( false !== $params['height'] ) {
         // Height has been specified. No modification necessary.
-    } else if ( 'thumb' == $params['type'] ) {
+    } elseif ( 'thumb' == $params['type'] ) {
         $params['height'] = bp_core_avatar_thumb_height();
     } else {
@@ -425 +425 @@
         if ( empty( $bp->grav_default->{$params['object']} ) ) {
             $default_grav = 'wavatar';
-        } else if ( 'mystery' == $bp->grav_default->{$params['object']} ) {
+        } elseif ( 'mystery' == $bp->grav_default->{$params['object']} ) {
             $default_grav = apply_filters( 'bp_core_mysteryman_src', 'mm', $params['width'] );
         } else {
@@ -435 +435 @@
             if ( 'user' == $params['object'] ) {
                 $params['email'] = bp_core_get_user_email( $params['item_id'] );
-            } else if ( 'group' == $params['object'] || 'blog' == $params['object'] ) {
+            } elseif ( 'group' == $params['object'] || 'blog' == $params['object'] ) {
                 $params['email'] = $params['item_id'] . '-' . $params['object'] . '@' . bp_get_root_domain();
             }
@@ -497 +497 @@
         if ( 'user' == $object )
             $item_id = bp_displayed_user_id();
-        else if ( 'group' == $object )
+        elseif ( 'group' == $object )
             $item_id = buddypress()->groups->current_group->id;
-        else if ( 'blog' == $object )
+        elseif ( 'blog' == $object )
             $item_id = $current_blog->id;
 
@@ -510 +510 @@
         if ( 'user' == $object )
             $avatar_dir = 'avatars';
-        else if ( 'group' == $object )
+        elseif ( 'group' == $object )
             $avatar_dir = 'group-avatars';
-        else if ( 'blog' == $object )
+        elseif ( 'blog' == $object )
             $avatar_dir = 'blog-avatars';
 
@@ -831 +831 @@
 
     // If passed a number, assume it was a $user_id
-    } else if ( is_numeric( $user ) ) {
+    } elseif ( is_numeric( $user ) ) {
         $id = $user;
 
@@ -1145 +1145 @@
 
     // Use the local default image
-    } else if ( 'local' === $type ) {
+    } elseif ( 'local' === $type ) {
         $avatar = buddypress()->plugin_url . 'bp-core/images/mystery-man.jpg';
 
@@ -1181 +1181 @@
 
     // Use the local default image
-    } else if ( 'local' === $type ) {
+    } elseif ( 'local' === $type ) {
         $avatar = buddypress()->plugin_url . 'bp-core/images/mystery-man-50.jpg';
 
@@ -1222 +1222 @@
 
     // Group's avatar create screen
-    } else if ( bp_is_group_create() ) {
+    } elseif ( bp_is_group_create() ) {
         /**
          * we can't use bp_get_groups_current_create_step()

trunk/src/bp-core/bp-core-buddybar.php

@@ -392 +392 @@
             // In the case of a user page, we try to assume a
             // redirect URL
-            } else if ( bp_is_user() ) {
+            } elseif ( bp_is_user() ) {
 
                 // Redirect to the displayed user's default

trunk/src/bp-core/bp-core-catchuri.php

@@ -671 +671 @@
         // and the current user is logged in. In this case we send to
         // the members directory to avoid redirect loops
-        } else if ( bp_is_register_page() && 'register' == $front_page_component && is_user_logged_in() ) {
+        } elseif ( bp_is_register_page() && 'register' == $front_page_component && is_user_logged_in() ) {
             $bp->canonical_stack['canonical_url'] = apply_filters( 'bp_loggedin_register_page_redirect_to', trailingslashit( bp_get_root_domain() . '/' . bp_get_members_root_slug() ) );
         }

trunk/src/bp-core/bp-core-classes.php

@@ -279 +279 @@
                     $sql['orderby'] = "ORDER BY u.user_id";
                     $sql['order'] = "DESC";
-                } else if ( 'random' == $type ) {
+                } elseif ( 'random' == $type ) {
                     $sql['orderby'] = "ORDER BY rand()";
                 } else {
@@ -2036 +2036 @@
             // No button if viewing your own profile (and not in
             // a members loop)
-            } else if ( bp_is_my_profile() ) {
+            } elseif ( bp_is_my_profile() ) {
                 return false;
             }
@@ -2834 +2834 @@
                         if ( 'relation' === $key ) {
                                 $relation = $query['relation'];
-                        } else if ( is_array( $clause ) ) {
+                        } elseif ( is_array( $clause ) ) {
                                 // This is a first-order clause
                                 if ( $this->is_first_order_clause( $clause ) ) {
@@ -2842 +2842 @@
                                         if ( ! $where_count ) {
                                                 $sql_chunks['where'][] = '';
-                                        } else if ( 1 === $where_count ) {
+                                        } elseif ( 1 === $where_count ) {
                                                 $sql_chunks['where'][] = $clause_sql['where'][0];
                                         } else {
@@ -2905 +2905 @@
                 $relation = $query;
 
-            } else if ( ! is_array( $query ) ) {
+            } elseif ( ! is_array( $query ) ) {
                 continue;
 
             // First-order clause.
-            } else if ( $this->is_first_order_clause( $query ) ) {
+            } elseif ( $this->is_first_order_clause( $query ) ) {
                 if ( isset( $query['value'] ) && array() === $query['value'] ) {
                     unset( $query['value'] );
@@ -2939 +2939 @@
          * simplifies the logic around combining key-only queries.
          */
-        } else if ( 1 === count( $clean_queries ) ) {
+        } elseif ( 1 === count( $clean_queries ) ) {
             $clean_queries['relation'] = 'OR';
 

trunk/src/bp-core/bp-core-cssjs.php

@@ -126 +126 @@
 
     // Less than 2x full-width: cropper defaults to full-width
-    } else if ( $image[0] < ( $full_width * 2 ) ) {
+    } elseif ( $image[0] < ( $full_width * 2 ) ) {
         $padding_w  = round( ( $image[0] - $full_width ) / 2 );
         $crop_left  = $padding_w;
@@ -143 +143 @@
 
     // Less than double full-height: cropper defaults to full-height
-    } else if ( $image[1] < ( $full_height * 2 ) ) {
+    } elseif ( $image[1] < ( $full_height * 2 ) ) {
         $padding_h   = round( ( $image[1] - $full_height ) / 2 );
         $crop_top    = $padding_h;

trunk/src/bp-core/bp-core-filters.php

@@ -376 +376 @@
          * meta['password'] is not set, the activation url must be WordPress one
          */
-        } else if ( buddypress()->members->admin->signups_page == get_current_screen()->id ) {
+        } elseif ( buddypress()->members->admin->signups_page == get_current_screen()->id ) {
             $is_hashpass_in_meta = maybe_unserialize( $meta );
 

trunk/src/bp-core/bp-core-functions.php

@@ -113 +113 @@
             if ( isset( $index->' . $key . ' ) ) {
                 $values[ $indexi ] = $index->' . $key . ';
-            } else if ( isset( $index["' . $key . '"] ) ) {
+            } elseif ( isset( $index["' . $key . '"] ) ) {
                 $values[ $indexi ] = $index["' . $key . '"];
             }
@@ -127 +127 @@
             if ( 0 > $cmp ) {
                 $retval = -1;
-            } else if ( 0 < $cmp ) {
+            } elseif ( 0 < $cmp ) {
                 $retval = 1;
             } else {

trunk/src/bp-core/bp-core-theme-compatibility.php

@@ -289 +289 @@
         // Brute-force check for a BP template
         // Examples are clones of bp-default
-        } else if ( locate_template( 'members/members-loop.php', false, false ) ) {
+        } elseif ( locate_template( 'members/members-loop.php', false, false ) ) {
             $theme_compat = false;
         }

trunk/src/bp-friends/bp-friends-actions.php

@@ -41 +41 @@
         }
 
-    } else if ( 'is_friend' == $friendship_status ) {
+    } elseif ( 'is_friend' == $friendship_status ) {
         bp_core_add_message( __( 'You are already friends with this user', 'buddypress' ), 'error' );
     } else {
@@ -79 +79 @@
         }
 
-    } else if ( 'is_friends' == $friendship_status ) {
+    } elseif ( 'is_friends' == $friendship_status ) {
         bp_core_add_message( __( 'You are not yet friends with this user', 'buddypress' ), 'error' );
     } else {

trunk/src/bp-friends/bp-friends-template.php

@@ -271 +271 @@
         if ( empty( $user_id ) && isset( $friends_template->friendship->friend ) )
             $user_id = $friends_template->friendship->friend->id;
-        else if ( empty( $user_id ) && !isset( $friends_template->friendship->friend ) )
+        elseif ( empty( $user_id ) && !isset( $friends_template->friendship->friend ) )
             $user_id = bp_displayed_user_id();
 

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

@@ -35 +35 @@
 
         // User doesn't have access, so set up redirect args
-        } else if ( is_user_logged_in() ) {
+        } elseif ( is_user_logged_in() ) {
             $no_access_args = array(
                 'message'  => __( 'You do not have access to this group.', 'buddypress' ),
@@ -184 +184 @@
             if ( 'private' == $_POST['group-status'] )
                 $group_status = 'private';
-            else if ( 'hidden' == $_POST['group-status'] )
+            elseif ( 'hidden' == $_POST['group-status'] )
                 $group_status = 'hidden';
 

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

@@ -166 +166 @@
 
     // Name and description changed - to keep things short, don't describe changes in detail.
-    } else if ( isset( $changed['name'] ) && isset( $changed['description'] ) ) {
+    } elseif ( isset( $changed['name'] ) && isset( $changed['description'] ) ) {
         $action = sprintf( __( '%1$s changed the name and description of the group %2$s', 'buddypress' ), $user_link, $group_link );
 
     // Name only.
-    } else if ( ! empty( $changed['name']['old'] ) && ! empty( $changed['name']['new'] ) ) {
+    } elseif ( ! empty( $changed['name']['old'] ) && ! empty( $changed['name']['new'] ) ) {
         $action = sprintf( __( '%1$s changed the name of the group %2$s from "%3$s" to "%4$s"', 'buddypress' ), $user_link, $group_link, esc_html( $changed['name']['old'] ), esc_html( $changed['name']['new'] ) );
 
     // Description only.
-    } else if ( ! empty( $changed['description']['old'] ) && ! empty( $changed['description']['new'] ) ) {
+    } elseif ( ! empty( $changed['description']['old'] ) && ! empty( $changed['description']['new'] ) ) {
         $action = sprintf( __( '%1$s changed the description of the group %2$s from "%3$s" to "%4$s"', 'buddypress' ), $user_link, $group_link, esc_html( $changed['description']['old'] ), esc_html( $changed['description']['new'] ) );
 

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

@@ -103 +103 @@
         bp_core_redirect( $redirect_to );
 
-    } else if ( 'edit' == $doaction && ! empty( $_GET['gid'] ) ) {
+    } elseif ( 'edit' == $doaction && ! empty( $_GET['gid'] ) ) {
         // columns screen option
         add_screen_option( 'layout_columns', array( 'default' => 2, 'max' => 2, ) );
@@ -309 +309 @@
                                 if ( 'admin' == $existing_role || 'mod' == $existing_role ) {
                                     $result = groups_demote_member( $user_id, $group_id );
-                                } else if ( 'banned' == $existing_role ) {
+                                } elseif ( 'banned' == $existing_role ) {
                                     $result = groups_unban_member( $user_id, $group_id );
                                 }
@@ -420 +420 @@
 
     // Display the group deletion confirmation screen
-    } else if ( 'delete' == $doaction && ! empty( $_GET['gid'] ) ) {
+    } elseif ( 'delete' == $doaction && ! empty( $_GET['gid'] ) ) {
         bp_groups_admin_delete();
 
@@ -457 +457 @@
         if ( ! empty( $errors ) ) {
             $messages[] = __( 'An error occurred when trying to update your group details.', 'buddypress' );
-        } else if ( ! empty( $updated ) ) {
+        } elseif ( ! empty( $updated ) ) {
             $messages[] = __( 'The group has been updated successfully.', 'buddypress' );
         }

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

@@ -1296 +1296 @@
 
                 // invite_sent means the user has been invited
-                } else if ( $user_status[ $gid ]->invite_sent ) {
+                } elseif ( $user_status[ $gid ]->invite_sent ) {
                     $is_invited = '1';
 
@@ -1612 +1612 @@
 
             // The string 'any' matches any non-zero value (inviter_id != 0)
-            } else if ( 'any' === $inviter_id ) {
+            } elseif ( 'any' === $inviter_id ) {
                 $sql['where'][] = "inviter_id != 0";
 
@@ -3370 +3370 @@
                 $this->params['show_tab'] = 'noone';
 
-            } else if ( isset( $this->params_raw['enable_nav_item'] ) || isset( $this->params_raw['visibility'] ) ) {
+            } elseif ( isset( $this->params_raw['enable_nav_item'] ) || isset( $this->params_raw['visibility'] ) ) {
                 // If enable_nav_item or visibility is passed,
                 // we assume this  is a legacy extension.

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

@@ -922 +922 @@
 
     // Otherwise, create a new invitation
-    } else if ( ! groups_is_user_member( $user_id, $group_id ) && ! groups_check_user_has_invite( $user_id, $group_id, 'all' ) ) {
+    } elseif ( ! groups_is_user_member( $user_id, $group_id ) && ! groups_check_user_has_invite( $user_id, $group_id, 'all' ) ) {
         $invite                = new BP_Groups_Member;
         $invite->group_id      = $group_id;

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

@@ -649 +649 @@
                 $bp->bp_options_title = _x( 'Memberships', 'My Groups page <title>', 'buddypress' );
 
-            } else if ( !bp_is_my_profile() && !bp_is_single_item() ) {
+            } elseif ( !bp_is_my_profile() && !bp_is_single_item() ) {
                 $bp->bp_options_avatar = bp_core_fetch_avatar( array(
                     'item_id' => bp_displayed_user_id(),
@@ -659 +659 @@
             // We are viewing a single group, so set up the
             // group navigation menu using the $this->current_group global.
-            } else if ( bp_is_single_item() ) {
+            } elseif ( bp_is_single_item() ) {
                 $bp->bp_options_title  = $this->current_group->name;
                 $bp->bp_options_avatar = bp_core_fetch_avatar( array(

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

@@ -72 +72 @@
         bp_core_redirect( $redirect_to );
 
-    } else if ( bp_is_action_variable( 'reject' ) && is_numeric( $group_id ) ) {
+    } elseif ( bp_is_action_variable( 'reject' ) && is_numeric( $group_id ) ) {
         // Check the nonce
         if ( !check_admin_referer( 'groups_reject_invite' ) )
@@ -180 +180 @@
 
         // Sticky a topic
-        else if ( bp_is_action_variable( 'stick', 2 ) && ( bp_is_item_admin() || bp_is_item_mod() ) ) {
+        elseif ( bp_is_action_variable( 'stick', 2 ) && ( bp_is_item_admin() || bp_is_item_mod() ) ) {
             // Check the nonce
             check_admin_referer( 'bp_forums_stick_topic' );
@@ -195 +195 @@
 
         // Un-Sticky a topic
-        else if ( bp_is_action_variable( 'unstick', 2 ) && ( bp_is_item_admin() || bp_is_item_mod() ) ) {
+        elseif ( bp_is_action_variable( 'unstick', 2 ) && ( bp_is_item_admin() || bp_is_item_mod() ) ) {
             // Check the nonce
             check_admin_referer( 'bp_forums_unstick_topic' );
@@ -210 +210 @@
 
         // Close a topic
-        else if ( bp_is_action_variable( 'close', 2 ) && ( bp_is_item_admin() || bp_is_item_mod() ) ) {
+        elseif ( bp_is_action_variable( 'close', 2 ) && ( bp_is_item_admin() || bp_is_item_mod() ) ) {
             // Check the nonce
             check_admin_referer( 'bp_forums_close_topic' );
@@ -225 +225 @@
 
         // Open a topic
-        else if ( bp_is_action_variable( 'open', 2 ) && ( bp_is_item_admin() || bp_is_item_mod() ) ) {
+        elseif ( bp_is_action_variable( 'open', 2 ) && ( bp_is_item_admin() || bp_is_item_mod() ) ) {
             // Check the nonce
             check_admin_referer( 'bp_forums_open_topic' );
@@ -240 +240 @@
 
         // Delete a topic
-        else if ( empty( $user_is_banned ) && bp_is_action_variable( 'delete', 2 ) && !bp_action_variable( 3 ) ) {
+        elseif ( empty( $user_is_banned ) && bp_is_action_variable( 'delete', 2 ) && !bp_action_variable( 3 ) ) {
             // Fetch the topic
             $topic = bp_forums_get_topic_details( $topic_id );
@@ -265 +265 @@
 
         // Editing a topic
-        else if ( empty( $user_is_banned ) && bp_is_action_variable( 'edit', 2 ) && !bp_action_variable( 3 ) ) {
+        elseif ( empty( $user_is_banned ) && bp_is_action_variable( 'edit', 2 ) && !bp_action_variable( 3 ) ) {
             // Fetch the topic
             $topic = bp_forums_get_topic_details( $topic_id );
@@ -293 +293 @@
 
         // Delete a post
-        } else if ( empty( $user_is_banned ) && bp_is_action_variable( 'delete', 2 ) && $post_id = bp_action_variable( 4 ) ) {
+        } elseif ( empty( $user_is_banned ) && bp_is_action_variable( 'delete', 2 ) && $post_id = bp_action_variable( 4 ) ) {
             // Fetch the post
             $post = bp_forums_get_post( $post_id );
@@ -317 +317 @@
 
         // Editing a post
-        } else if ( empty( $user_is_banned ) && bp_is_action_variable( 'edit', 2 ) && $post_id = bp_action_variable( 4 ) ) {
+        } elseif ( empty( $user_is_banned ) && bp_is_action_variable( 'edit', 2 ) && $post_id = bp_action_variable( 4 ) ) {
 
             // Fetch the post
@@ -380 +380 @@
             if ( empty( $_POST['topic_title'] ) ) {
                 $error_message = __( 'Please provide a title for your forum topic.', 'buddypress' );
-            } else if ( empty( $_POST['topic_text'] ) ) {
+            } elseif ( empty( $_POST['topic_text'] ) ) {
                 $error_message = __( 'Forum posts cannot be empty. Please enter some text.', 'buddypress' );
             }
@@ -493 +493 @@
         $message = __( 'You are not allowed to send or remove invites', 'buddypress' );
         $error = 'error';
-    } else if ( BP_Groups_Member::check_for_membership_request( $friend_id, $group_id ) ) {
+    } elseif ( BP_Groups_Member::check_for_membership_request( $friend_id, $group_id ) ) {
         $message = __( 'The member requested to join the group', 'buddypress' );
         $error = 'error';
-    } else if ( ! groups_uninvite_user( $friend_id, $group_id ) ) {
+    } elseif ( ! groups_uninvite_user( $friend_id, $group_id ) ) {
         $message = __( 'There was an error removing the invite', 'buddypress' );
         $error = 'error';

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

@@ -234 +234 @@
         if ( 'invites' == $type ) {
             $this->groups = groups_get_invites_for_user( $user_id, $this->pag_num, $this->pag_page, $exclude );
-        } else if ( 'single-group' == $type ) {
+        } elseif ( 'single-group' == $type ) {
             $this->single_group = true;
 
@@ -280 +280 @@
             $this->group_count       = (int) $this->groups['total'];
             $this->groups            = $this->groups['groups'];
-        } else if ( 'single-group' == $type ) {
+        } elseif ( 'single-group' == $type ) {
             if ( empty( $group->id ) ) {
                 $this->total_group_count = 0;
@@ -711 +711 @@
         if ( 'public' == $group->status ) {
             $type = __( "Public Group", "buddypress" );
-        } else if ( 'hidden' == $group->status ) {
+        } elseif ( 'hidden' == $group->status ) {
             $type = __( "Hidden Group", "buddypress" );
-        } else if ( 'private' == $group->status ) {
+        } elseif ( 'private' == $group->status ) {
             $type = __( "Private Group", "buddypress" );
         } else {
@@ -1863 +1863 @@
             // Default to the current group first
             $group_id = $bp->groups->current_group->id;
-        } else if ( isset( $groups_template->group->id ) ) {
+        } elseif ( isset( $groups_template->group->id ) ) {
             // Then see if we're in the loop
             $group_id = $groups_template->group->id;
@@ -2947 +2947 @@
             if ( is_user_logged_in() && bp_group_is_invited() ) {
                 $message = __( 'You must accept your pending invitation before you can access this private group.', 'buddypress' );
-            } else if ( is_user_logged_in() ) {
+            } elseif ( is_user_logged_in() ) {
                 $message = __( 'This is a private group and you must request group membership in order to join.', 'buddypress' );
             } else {

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

@@ -93 +93 @@
                                     if ( 'active' == $instance['group_default'] )
                                         printf( __( 'active %s', 'buddypress' ), bp_get_group_last_active() );
-                                    else if ( 'popular' == $instance['group_default'] )
+                                    elseif ( 'popular' == $instance['group_default'] )
                                         bp_group_member_count();
                                 ?>
@@ -203 +203 @@
                             if ( 'newest-groups' == $_POST['filter'] ) {
                                 printf( __( 'created %s', 'buddypress' ), bp_get_group_date_created() );
-                            } else if ( 'recently-active-groups' == $_POST['filter'] ) {
+                            } elseif ( 'recently-active-groups' == $_POST['filter'] ) {
                                 printf( __( 'active %s', 'buddypress' ), bp_get_group_last_active() );
-                            } else if ( 'popular-groups' == $_POST['filter'] ) {
+                            } elseif ( 'popular-groups' == $_POST['filter'] ) {
                                 bp_group_member_count();
                             }

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

@@ -1471 +1471 @@
 
             // Handle activated accounts
-            } else if ( 'do_activate' == $doaction ) {
+            } elseif ( 'do_activate' == $doaction ) {
 
                 // nonce check
@@ -1498 +1498 @@
 
             // Handle sign-ups delete
-            } else if ( 'do_delete' == $doaction ) {
+            } elseif ( 'do_delete' == $doaction ) {
 
                 // nonce check
@@ -1876 +1876 @@
         if ( ! empty( $_POST['allsignups'] ) ) {
             $ids = wp_parse_id_list( $_POST['allsignups'] );
-        } else if ( ! empty( $_GET['signup_id'] ) ) {
+        } elseif ( ! empty( $_GET['signup_id'] ) ) {
             $ids = absint( $_GET['signup_id'] );
         }

trunk/src/bp-members/bp-members-functions.php

@@ -1939 +1939 @@
         // If a user ID is found, this may be a legacy signup, or one
         // created locally for backward compatibility. Process it.
-        } else if ( $key == wp_hash( $user_id ) ) {
+        } elseif ( $key == wp_hash( $user_id ) ) {
             // Change the user's status so they become active
             if ( ! $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->users} SET user_status = 0 WHERE ID = %d", $user_id ) ) ) {
@@ -2397 +2397 @@
     if ( isset( $_GLOBALS['pagenow'] ) && false !== strpos( $GLOBALS['pagenow'], 'wp-login.php' ) ) {
         $is_login = true;
-    } else if ( isset( $_SERVER['SCRIPT_NAME'] ) && false !== strpos( $_SERVER['SCRIPT_NAME'], 'wp-login.php' ) ) {
+    } elseif ( isset( $_SERVER['SCRIPT_NAME'] ) && false !== strpos( $_SERVER['SCRIPT_NAME'], 'wp-login.php' ) ) {
         $is_login = true;
     }

trunk/src/bp-members/bp-members-template.php

@@ -607 +607 @@
         if ( 'active' == $members_template->type )
             $pag = sprintf( _n( 'Viewing 1 active member', 'Viewing %1$s - %2$s of %3$s active members', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
-        else if ( 'popular' == $members_template->type )
+        elseif ( 'popular' == $members_template->type )
             $pag = sprintf( _n( 'Viewing 1 member with friends', 'Viewing %1$s - %2$s of %3$s members with friends', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
-        else if ( 'online' == $members_template->type )
+        elseif ( 'online' == $members_template->type )
             $pag = sprintf( _n( 'Viewing 1 online member', 'Viewing %1$s - %2$s of %3$s online members', $members_template->total_member_count, 'buddypress' ), $from_num, $to_num, $total );
         else
@@ -2183 +2183 @@
             if ( empty( $bp->grav_default->user ) )
                 $default_grav = 'wavatar';
-            else if ( 'mystery' == $bp->grav_default->user )
+            elseif ( 'mystery' == $bp->grav_default->user )
                 $default_grav = $bp->plugin_url . 'bp-core/images/mystery-man.jpg';
             else

trunk/src/bp-messages/bp-messages-classes.php

@@ -475 +475 @@
         if ( $type == 'unread' )
             $type_sql = " AND unread_count != 0 ";
-        else if ( $type == 'read' )
+        elseif ( $type == 'read' )
             $type_sql = " AND unread_count = 0 ";
 

trunk/src/bp-messages/bp-messages-screens.php

@@ -211 +211 @@
                 bp_core_add_message( __('Notice deactivated.', 'buddypress') );
             }
-        } else if ( bp_is_action_variable( 'activate', 0 ) ) {
+        } elseif ( bp_is_action_variable( 'activate', 0 ) ) {
             if ( !$notice->activate() ) {
                 bp_core_add_message( __('There was a problem activating that notice.', 'buddypress'), 'error' );
@@ -217 +217 @@
                 bp_core_add_message( __('Notice activated.', 'buddypress') );
             }
-        } else if ( bp_is_action_variable( 'delete' ) ) {
+        } elseif ( bp_is_action_variable( 'delete' ) ) {
             if ( !$notice->delete() ) {
                 bp_core_add_message( __('There was a problem deleting that notice.', 'buddypress'), 'buddypress' );

trunk/src/bp-messages/bp-messages-template.php

@@ -1154 +1154 @@
              */
             return apply_filters( 'bp_get_messages_username_value', $_COOKIE['bp_messages_send_to'] );
-        } else if ( isset( $_GET['r'] ) && !isset( $_COOKIE['bp_messages_send_to'] ) ) {
+        } elseif ( isset( $_GET['r'] ) && !isset( $_COOKIE['bp_messages_send_to'] ) ) {
             /** This filter is documented in bp-messages-template.php */
             return apply_filters( 'bp_get_messages_username_value', $_GET['r'] );

trunk/src/bp-templates/bp-legacy/buddypress-functions.php

@@ -1080 +1080 @@
 
         // Create the user invitation
-        } else if ( groups_invite_user( array( 'user_id' => $friend_id, 'group_id' => $group_id ) ) ) {
+        } elseif ( groups_invite_user( array( 'user_id' => $friend_id, 'group_id' => $group_id ) ) ) {
             $user_status = 'is_invited';
 

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

@@ -44 +44 @@
         xprofile_admin_manage_field( $_GET['group_id'] );
 
-    else if ( isset( $_GET['mode'] ) && isset( $_GET['group_id'] ) && isset( $_GET['field_id'] ) && 'edit_field' == $_GET['mode'] )
+    elseif ( isset( $_GET['mode'] ) && isset( $_GET['group_id'] ) && isset( $_GET['field_id'] ) && 'edit_field' == $_GET['mode'] )
         xprofile_admin_manage_field( $_GET['group_id'], $_GET['field_id'] );
 
-    else if ( isset( $_GET['mode'] ) && isset( $_GET['field_id'] ) && 'delete_field' == $_GET['mode'] )
+    elseif ( isset( $_GET['mode'] ) && isset( $_GET['field_id'] ) && 'delete_field' == $_GET['mode'] )
         xprofile_admin_delete_field( $_GET['field_id'], 'field');
 
-    else if ( isset( $_GET['mode'] ) && isset( $_GET['option_id'] ) && 'delete_option' == $_GET['mode'] )
+    elseif ( isset( $_GET['mode'] ) && isset( $_GET['option_id'] ) && 'delete_option' == $_GET['mode'] )
         xprofile_admin_delete_field( $_GET['option_id'], 'option' );
 
-    else if ( isset( $_GET['mode'] ) && 'add_group' == $_GET['mode'] )
+    elseif ( isset( $_GET['mode'] ) && 'add_group' == $_GET['mode'] )
         xprofile_admin_manage_group();
 
-    else if ( isset( $_GET['mode'] ) && isset( $_GET['group_id'] ) && 'delete_group' == $_GET['mode'] )
+    elseif ( isset( $_GET['mode'] ) && isset( $_GET['group_id'] ) && 'delete_group' == $_GET['mode'] )
         xprofile_admin_delete_group( $_GET['group_id'] );
 
-    else if ( isset( $_GET['mode'] ) && isset( $_GET['group_id'] ) && 'edit_group' == $_GET['mode'] )
+    elseif ( isset( $_GET['mode'] ) && isset( $_GET['group_id'] ) && 'edit_group' == $_GET['mode'] )
         xprofile_admin_manage_group( $_GET['group_id'] );
 

trunk/src/bp-xprofile/bp-xprofile-classes.php

@@ -192 +192 @@
         if ( ! empty( $profile_group_id ) ) {
             $where_sql = $wpdb->prepare( 'WHERE g.id = %d', $profile_group_id );
-        } else if ( $exclude_groups ) {
+        } elseif ( $exclude_groups ) {
             $exclude_groups = join( ',', wp_parse_id_list( $exclude_groups ) );
             $where_sql = "WHERE g.id NOT IN ({$exclude_groups})";
@@ -493 +493 @@
                 if ( 'default_visibility' == $level->meta_key ) {
                     $default_visibility_levels[ $level->object_id ]['default'] = $level->meta_value;
-                } else if ( 'allow_custom_visibility' == $level->meta_key ) {
+                } elseif ( 'allow_custom_visibility' == $level->meta_key ) {
                     $default_visibility_levels[ $level->object_id ]['allow_custom'] = $level->meta_value;
                 }
@@ -1325 +1325 @@
                 $result   = $wpdb->query( $wpdb->prepare( "UPDATE {$bp->profile->table_name_data} SET value = %s, last_updated = %s WHERE user_id = %d AND field_id = %d", $this->value, $this->last_updated, $this->user_id, $this->field_id ) );
 
-            } else if ( $this->exists() && empty( $this->value ) ) {
+            } elseif ( $this->exists() && empty( $this->value ) ) {
                 // Data removed, delete the entry.
                 $result   = $this->delete();
@@ -1641 +1641 @@
                     if ( $values[$i]->name == $fields[$j] ) {
                         $new_values[$fields[$j]] = $values[$i]->value;
-                    } else if ( !array_key_exists( $fields[$j], $new_values ) ) {
+                    } elseif ( !array_key_exists( $fields[$j], $new_values ) ) {
                         $new_values[$fields[$j]] = NULL;
                     }
@@ -3735 +3735 @@
                 $relation = $query;
 
-            } else if ( ! is_array( $query ) ) {
+            } elseif ( ! is_array( $query ) ) {
                 continue;
 
             // First-order clause.
-            } else if ( $this->is_first_order_clause( $query ) ) {
+            } elseif ( $this->is_first_order_clause( $query ) ) {
                 if ( isset( $query['value'] ) && array() === $query['value'] ) {
                     unset( $query['value'] );
@@ -3769 +3769 @@
          * simplifies the logic around combining key-only queries.
          */
-        } else if ( 1 === count( $clean_queries ) ) {
+        } elseif ( 1 === count( $clean_queries ) ) {
             $clean_queries['relation'] = 'OR';
 
@@ -3886 +3886 @@
             if ( 'relation' === $key ) {
                 $relation = $query['relation'];
-            } else if ( is_array( $clause ) ) {
+            } elseif ( is_array( $clause ) ) {
 
                 // This is a first-order clause.
@@ -3895 +3895 @@
                     if ( ! $where_count ) {
                         $sql_chunks['where'][] = '';
-                    } else if ( 1 === $where_count ) {
+                    } elseif ( 1 === $where_count ) {
                         $sql_chunks['where'][] = $clause_sql['where'][0];
                     } else {
@@ -4150 +4150 @@
 
             // Clauses joined by AND with "negative" operators share a join only if they also share a key.
-            } else if ( isset( $sibling['field_id'] ) && isset( $clause['field_id'] ) && $sibling['field_id'] === $clause['field_id'] ) {
+            } elseif ( isset( $sibling['field_id'] ) && isset( $clause['field_id'] ) && $sibling['field_id'] === $clause['field_id'] ) {
                 $compatible_compares = array( '!=', 'NOT IN', 'NOT LIKE' );
             }