From dccf5ceb90e5698eba66f7bb1da823f0a3980b66 Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Sun, 8 Mar 2015 23:09:27 +0000 Subject: [PATCH] Empty `return` statements are unnecessary at the end of functions. See #30799. Built from https://develop.svn.wordpress.org/trunk@31679 git-svn-id: http://core.svn.wordpress.org/trunk@31660 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/deprecated.php | 4 ---- wp-admin/includes/ms-deprecated.php | 1 - wp-includes/cache.php | 1 - wp-includes/date.php | 2 -- wp-includes/deprecated.php | 1 - wp-includes/version.php | 2 +- 6 files changed, 1 insertion(+), 10 deletions(-) diff --git a/wp-admin/includes/deprecated.php b/wp-admin/includes/deprecated.php index 8ae6048edc..d1eebac0e8 100644 --- a/wp-admin/includes/deprecated.php +++ b/wp-admin/includes/deprecated.php @@ -33,7 +33,6 @@ function tinymce_include() { */ function documentation_link() { _deprecated_function( __FUNCTION__, '2.5' ); - return; } /** @@ -204,7 +203,6 @@ function remove_option_update_handler( $option_group, $option_name, $sanitize_ca **/ function codepress_get_lang( $filename ) { _deprecated_function( __FUNCTION__, '3.0' ); - return; } /** @@ -215,7 +213,6 @@ function codepress_get_lang( $filename ) { **/ function codepress_footer_js() { _deprecated_function( __FUNCTION__, '3.0' ); - return; } /** @@ -226,7 +223,6 @@ function codepress_footer_js() { **/ function use_codepress() { _deprecated_function( __FUNCTION__, '3.0' ); - return; } /** diff --git a/wp-admin/includes/ms-deprecated.php b/wp-admin/includes/ms-deprecated.php index 44e2a82b20..6a443dee61 100644 --- a/wp-admin/includes/ms-deprecated.php +++ b/wp-admin/includes/ms-deprecated.php @@ -53,7 +53,6 @@ function activate_sitewide_plugin() { */ function deactivate_sitewide_plugin( $plugin = false ) { _deprecated_function(__FUNCTION__, '3.0', 'deactivate_plugin()' ); - return; } /** diff --git a/wp-includes/cache.php b/wp-includes/cache.php index 77be09d090..f5ad2cc87c 100644 --- a/wp-includes/cache.php +++ b/wp-includes/cache.php @@ -217,7 +217,6 @@ function wp_cache_add_global_groups( $groups ) { */ function wp_cache_add_non_persistent_groups( $groups ) { // Default cache doesn't persist so nothing to do here. - return; } /** diff --git a/wp-includes/date.php b/wp-includes/date.php index 84ec325a0e..f37d6ccc86 100644 --- a/wp-includes/date.php +++ b/wp-includes/date.php @@ -182,8 +182,6 @@ class WP_Date_Query { $this->compare = $this->get_compare( $date_query ); $this->queries = $this->sanitize_query( $date_query ); - - return; } /** diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php index 6d71f646b2..77dd70b462 100644 --- a/wp-includes/deprecated.php +++ b/wp-includes/deprecated.php @@ -2632,7 +2632,6 @@ function the_editor($content, $id = 'content', $prev_id = 'title', $media_button _deprecated_function( __FUNCTION__, '3.3', 'wp_editor()' ); wp_editor( $content, $id, array( 'media_buttons' => $media_buttons ) ); - return; } /** diff --git a/wp-includes/version.php b/wp-includes/version.php index 9edb0350e3..d1380ab8d0 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.2-alpha-31678'; +$wp_version = '4.2-alpha-31679'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.