Changeset 31090 for trunk/src/wp-includes/user.php

Timestamp:

01/08/2015 07:04:40 AM (12 years ago)

Author:

wonderboymusic

Message:

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

This was a mess, is now standardized across the codebase, except for a few 3rd-party libs.

See #30799.

File:

• trunk/src/wp-includes/user.php (modified) (3 diffs)

trunk/src/wp-includes/user.php

@@ -631 +631 @@
                         } elseif ( 'meta_value' == $qv['orderby'] ) {
                                 $orderby = "$wpdb->usermeta.meta_value";
-                        } else if ( 'include' === $qv['orderby'] && ! empty( $include ) ) {
+                        } elseif ( 'include' === $qv['orderby'] && ! empty( $include ) ) {
                                 // Sanitized earlier.
                                 $include_sql = implode( ',', $include );
@@ -1515 +1515 @@
                 else
                         $value = esc_attr($value);
-        } else if ( 'db' == $context ) {
+        } elseif ( 'db' == $context ) {
                 if ( $prefixed ) {
                         /** This filter is documented in wp-includes/post.php */
@@ -1560 +1560 @@
                 $value = esc_url($value);
 
-        if ( 'attribute' == $context )
-                $value = esc_attr($value);
-        else if ( 'js' == $context )
-                $value = esc_js($value);
-
+        if ( 'attribute' == $context ) {
+                $value = esc_attr( $value );
+        } elseif ( 'js' == $context ) {
+                $value = esc_js( $value );
+        }
         return $value;
 }