Changeset 9315 for trunk/src/bp-core/bp-core-avatars.php

Timestamp:

01/08/2015 09:43:47 PM (11 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.

File:

• trunk/src/bp-core/bp-core-avatars.php (modified) (10 diffs)

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()