Upstream
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity

Customizer et al, use `elseif` in PHP, not `else if`. 

This was corrected via brute force in [31090].

See #32444.

Built from https://develop.svn.wordpress.org/trunk@32874


git-svn-id: http://core.svn.wordpress.org/trunk@32845 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Scott Taylor 2015-06-19 22:01:25 +00:00
parent a75961da89
commit 5e994cd6a1
8 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/class-wp-customize-nav-menus.php
View File

@ -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;

4
wp-includes/class-wp-customize-setting.php
View File

@ -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 );
}

2
wp-includes/class-wp-customize-widgets.php
View File

@ -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' );
}

4
wp-includes/comment.php
View File

@ -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 ];

2
wp-includes/link-template.php
View File

@ -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 );
}

6
wp-includes/taxonomy.php
View File

@ -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 {

2
wp-includes/user.php
View File

@ -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.

2
wp-includes/version.php
View File

@ -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.