diff --git a/wp-includes/class-wp-customize-nav-menus.php b/wp-includes/class-wp-customize-nav-menus.php index 126b9f09b1..70ba0e3a54 100644 --- a/wp-includes/class-wp-customize-nav-menus.php +++ b/wp-includes/class-wp-customize-nav-menus.php @@ -118,7 +118,7 @@ final class WP_Customize_Nav_Menus { 'object_id' => (int) $post->ID, ); } - } else if ( 'taxonomy' === $obj_type ) { + } elseif ( 'taxonomy' === $obj_type ) { $terms = get_terms( $taxonomy_or_post_type, array( 'child_of' => 0, 'exclude' => '', @@ -339,7 +339,7 @@ final class WP_Customize_Nav_Menus { $setting_args = array( '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, ); @@ -362,7 +362,7 @@ final class WP_Customize_Nav_Menus { 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'; } return $setting_class; diff --git a/wp-includes/class-wp-customize-setting.php b/wp-includes/class-wp-customize-setting.php index 17caf6bac3..645bda72f5 100644 --- a/wp-includes/class-wp-customize-setting.php +++ b/wp-includes/class-wp-customize-setting.php @@ -858,7 +858,7 @@ class WP_Customize_Nav_Menu_Item_Setting extends WP_Customize_Setting { 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 ) ) { $original_title = ''; @@ -1737,7 +1737,7 @@ class WP_Customize_Nav_Menu_Setting extends WP_Customize_Setting { $i = array_search( $menu_id, $nav_menu_options['auto_add'] ); 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 ); } diff --git a/wp-includes/class-wp-customize-widgets.php b/wp-includes/class-wp-customize-widgets.php index e784c66a10..59db32b5a8 100644 --- a/wp-includes/class-wp-customize-widgets.php +++ b/wp-includes/class-wp-customize-widgets.php @@ -747,7 +747,7 @@ final class WP_Customize_Widgets { if ( preg_match( $this->setting_id_patterns['sidebar_widgets'], $id, $matches ) ) { $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' ); } diff --git a/wp-includes/comment.php b/wp-includes/comment.php index 039d529939..80f30e2a8a 100644 --- a/wp-includes/comment.php +++ b/wp-includes/comment.php @@ -972,9 +972,9 @@ class WP_Comment_Query { $parsed = false; 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 ] ) ) { $meta_clause = $meta_query_clauses[ $orderby ]; diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php index 00d3d98a24..c09e22fea1 100644 --- a/wp-includes/link-template.php +++ b/wp-includes/link-template.php @@ -920,7 +920,7 @@ function get_edit_term_link( $term_id, $taxonomy, $object_type = '' ) { 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 ); } diff --git a/wp-includes/taxonomy.php b/wp-includes/taxonomy.php index 26956145fc..cbc592a5c0 100644 --- a/wp-includes/taxonomy.php +++ b/wp-includes/taxonomy.php @@ -2712,11 +2712,11 @@ function wp_get_object_terms($object_ids, $taxonomies, $args = array()) { 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 = ''; } else { diff --git a/wp-includes/user.php b/wp-includes/user.php index c6410cb779..b103757706 100644 --- a/wp-includes/user.php +++ b/wp-includes/user.php @@ -721,7 +721,7 @@ class WP_User_Query { if ( empty( $qv['orderby'] ) ) { // 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 { // 'orderby' values may be a comma- or space-separated list. diff --git a/wp-includes/version.php b/wp-includes/version.php index 8090e89080..d32f39b0fc 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.3-alpha-32873'; +$wp_version = '4.3-alpha-32874'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.