Changeset 32874

Timestamp:

06/19/2015 10:00:33 PM (9 years ago)

Author:

wonderboymusic

Message:

Customizer et al, use elseif in PHP, not else if.
This was corrected via brute force in [31090].

See #32444.

Location:

trunk/src/wp-includes

Files:

• class-wp-customize-nav-menus.php (modified) (3 diffs)
• class-wp-customize-setting.php (modified) (2 diffs)
• class-wp-customize-widgets.php (modified) (1 diff)
• comment.php (modified) (1 diff)
• link-template.php (modified) (1 diff)
• taxonomy.php (modified) (1 diff)
• user.php (modified) (1 diff)

trunk/src/wp-includes/class-wp-customize-nav-menus.php

@@ -119 +119 @@
                 );
             }
-        } else if ( 'taxonomy' === $obj_type ) {
+        } elseif ( 'taxonomy' === $obj_type ) {
             $terms = get_terms( $taxonomy_or_post_type, array(
                 'child_of'     => 0,
@@ -340 +340 @@
                 'type' => WP_Customize_Nav_Menu_Setting::TYPE,
             );
-        } else if ( preg_match( WP_Customize_Nav_Menu_Item_Setting::ID_PATTERN, $setting_id ) ) {
+        } elseif ( preg_match( WP_Customize_Nav_Menu_Item_Setting::ID_PATTERN, $setting_id ) ) {
             $setting_args = array(
                 'type' => WP_Customize_Nav_Menu_Item_Setting::TYPE,
@@ -363 +363 @@
         if ( ! empty( $setting_args['type'] ) && WP_Customize_Nav_Menu_Setting::TYPE === $setting_args['type'] ) {
             $setting_class = 'WP_Customize_Nav_Menu_Setting';
-        } else if ( ! empty( $setting_args['type'] ) && WP_Customize_Nav_Menu_Item_Setting::TYPE === $setting_args['type'] ) {
+        } elseif ( ! empty( $setting_args['type'] ) && WP_Customize_Nav_Menu_Item_Setting::TYPE === $setting_args['type'] ) {
             $setting_class = 'WP_Customize_Nav_Menu_Item_Setting';
         }

trunk/src/wp-includes/class-wp-customize-setting.php

@@ -859 +859 @@
                     if ( 'post_type' === $value['type'] ) {
                         $original_title = get_the_title( $value['object_id'] );
-                    } else if ( 'taxonomy' === $value['type'] ) {
+                    } elseif ( 'taxonomy' === $value['type'] ) {
                         $original_title = get_term_field( 'name', $value['object_id'], $value['object'], 'raw' );
                         if ( is_wp_error( $original_title ) ) {
@@ -1738 +1738 @@
         if ( $auto_add && false === $i ) {
             array_push( $nav_menu_options['auto_add'], $this->term_id );
-        } else if ( ! $auto_add && false !== $i ) {
+        } elseif ( ! $auto_add && false !== $i ) {
             array_splice( $nav_menu_options['auto_add'], $i, 1 );
         }

trunk/src/wp-includes/class-wp-customize-widgets.php

@@ -748 +748 @@
             $args['sanitize_callback'] = array( $this, 'sanitize_sidebar_widgets' );
             $args['sanitize_js_callback'] = array( $this, 'sanitize_sidebar_widgets_js_instance' );
-        } else if ( preg_match( $this->setting_id_patterns['widget_instance'], $id, $matches ) ) {
+        } elseif ( preg_match( $this->setting_id_patterns['widget_instance'], $id, $matches ) ) {
             $args['sanitize_callback'] = array( $this, 'sanitize_widget_instance' );
             $args['sanitize_js_callback'] = array( $this, 'sanitize_widget_js_instance' );

trunk/src/wp-includes/comment.php

@@ -973 +973 @@
         if ( $orderby == $this->query_vars['meta_key'] || $orderby == 'meta_value' ) {
             $parsed = "$wpdb->commentmeta.meta_value";
-        } else if ( $orderby == 'meta_value_num' ) {
+        } elseif ( $orderby == 'meta_value_num' ) {
             $parsed = "$wpdb->commentmeta.meta_value+0";
-        } else if ( in_array( $orderby, $allowed_keys ) ) {
+        } elseif ( in_array( $orderby, $allowed_keys ) ) {
 
             if ( isset( $meta_query_clauses[ $orderby ] ) ) {

trunk/src/wp-includes/link-template.php

@@ -921 +921 @@
     if ( $object_type ) {
         $args['post_type'] = $object_type;
-    } else if ( ! empty( $tax->object_type ) ) {
+    } elseif ( ! empty( $tax->object_type ) ) {
         $args['post_type'] = reset( $tax->object_type );
     }

trunk/src/wp-includes/taxonomy.php

@@ -2713 +2713 @@
     if ( in_array( $orderby, array( 'term_id', 'name', 'slug', 'term_group' ) ) ) {
         $orderby = "t.$orderby";
-    } else if ( in_array( $orderby, array( 'count', 'parent', 'taxonomy', 'term_taxonomy_id' ) ) ) {
+    } elseif ( in_array( $orderby, array( 'count', 'parent', 'taxonomy', 'term_taxonomy_id' ) ) ) {
         $orderby = "tt.$orderby";
-    } else if ( 'term_order' === $orderby ) {
+    } elseif ( 'term_order' === $orderby ) {
         $orderby = 'tr.term_order';
-    } else if ( 'none' === $orderby ) {
+    } elseif ( 'none' === $orderby ) {
         $orderby = '';
         $order = '';

trunk/src/wp-includes/user.php

@@ -722 +722 @@
             // Default order is by 'user_login'.
             $ordersby = array( 'user_login' => $order );
-        } else if ( is_array( $qv['orderby'] ) ) {
+        } elseif ( is_array( $qv['orderby'] ) ) {
             $ordersby = $qv['orderby'];
         } else {