From 0f6d0b84d1e5e146808a2662b58f4bfec214c93d Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Fri, 16 Jan 2015 21:19:22 +0000 Subject: [PATCH] Remove unused local vars in `delete_plugins()`, `delete_theme()`, `WP_Date_Query->validate_date_values()`, `global_terms()`, and `WP_Text_Diff_Renderer_Table->_changed()`. This will clear out the "Unused Code" label in the next Scrutinizer report. See #30799. Built from https://develop.svn.wordpress.org/trunk@31217 git-svn-id: http://core.svn.wordpress.org/trunk@31198 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/plugin.php | 3 --- wp-admin/includes/theme.php | 3 --- wp-includes/date.php | 1 - wp-includes/ms-functions.php | 8 +++++--- wp-includes/version.php | 2 +- wp-includes/wp-diff.php | 2 +- 6 files changed, 7 insertions(+), 12 deletions(-) diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php index c0d44ff6fc..bb16117fb7 100644 --- a/wp-admin/includes/plugin.php +++ b/wp-admin/includes/plugin.php @@ -805,9 +805,6 @@ function delete_plugins( $plugins, $deprecated = '' ) { $plugins_dir = trailingslashit( $plugins_dir ); - $translations_dir = $wp_filesystem->wp_lang_dir(); - $translations_dir = trailingslashit( $translations_dir ); - $plugin_translations = wp_get_installed_translations( 'plugins' ); $errors = array(); diff --git a/wp-admin/includes/theme.php b/wp-admin/includes/theme.php index a6b9fb031a..2c3a8276d6 100644 --- a/wp-admin/includes/theme.php +++ b/wp-admin/includes/theme.php @@ -69,9 +69,6 @@ function delete_theme($stylesheet, $redirect = '') { return new WP_Error( 'could_not_remove_theme', sprintf( __( 'Could not fully remove the theme %s.' ), $stylesheet ) ); } - $translations_dir = $wp_filesystem->wp_lang_dir(); - $translations_dir = trailingslashit( $translations_dir ); - $theme_translations = wp_get_installed_translations( 'themes' ); // Remove language files, silently. diff --git a/wp-includes/date.php b/wp-includes/date.php index d2c8f6971d..58071d3d3a 100644 --- a/wp-includes/date.php +++ b/wp-includes/date.php @@ -391,7 +391,6 @@ class WP_Date_Query { } // Throw a notice for each failing value. - $is_between = true; foreach ( (array) $date_query[ $key ] as $_value ) { $is_between = $_value >= $check['min'] && $_value <= $check['max']; diff --git a/wp-includes/ms-functions.php b/wp-includes/ms-functions.php index 92af129c04..f2df7e327c 100644 --- a/wp-includes/ms-functions.php +++ b/wp-includes/ms-functions.php @@ -1805,10 +1805,12 @@ function global_terms( $term_id, $deprecated = '' ) { } } elseif ( $global_id != $term_id ) { $local_id = $wpdb->get_row( $wpdb->prepare( "SELECT term_id FROM $wpdb->terms WHERE term_id = %d", $global_id ) ); - if ( null != $local_id ) - $local_id = global_terms( $local_id ); - if ( 10 < $global_terms_recurse ) + if ( null != $local_id ) { + global_terms( $local_id ); + if ( 10 < $global_terms_recurse ) { $global_id = $term_id; + } + } } if ( $global_id != $term_id ) { diff --git a/wp-includes/version.php b/wp-includes/version.php index 3f31d515b4..d964d96da0 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.2-alpha-31216'; +$wp_version = '4.2-alpha-31217'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. diff --git a/wp-includes/wp-diff.php b/wp-includes/wp-diff.php index aa6ada8c35..95fa9dcf87 100644 --- a/wp-includes/wp-diff.php +++ b/wp-includes/wp-diff.php @@ -273,7 +273,7 @@ class WP_Text_Diff_Renderer_Table extends Text_Diff_Renderer { $diff = $renderer->render( $text_diff ); // If they're too different, don't include any or - if ( $diff_count = preg_match_all( '!(.*?|.*?)!', $diff, $diff_matches ) ) { + if ( preg_match_all( '!(.*?|.*?)!', $diff, $diff_matches ) ) { // length of all text between or $stripped_matches = strlen(strip_tags( join(' ', $diff_matches[0]) )); // since we count lengith of text between or (instead of picking just one),