From e2c6216b21b643c2984303bfb110f730873b08ff Mon Sep 17 00:00:00 2001 From: Jeremy Felt Date: Thu, 1 Oct 2015 22:46:28 +0000 Subject: [PATCH] MS: Remove `@todo` for `ms_protect_special_option()` from `delete_site_option()`. This todo has been in place since the original merge of MU. At the time of merge, `wpmu_protect_special_option()` protected an empty array, and there has been no noticeable need since. As we introduce `_network_option()`, let's leave this behind. A new ticket can be opened if necessary. See #28290. Built from https://develop.svn.wordpress.org/trunk@34756 git-svn-id: http://core.svn.wordpress.org/trunk@34721 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-includes/option.php | 2 -- wp-includes/version.php | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/wp-includes/option.php b/wp-includes/option.php index ab8f81b875..e99b37f760 100644 --- a/wp-includes/option.php +++ b/wp-includes/option.php @@ -1185,8 +1185,6 @@ function add_site_option( $option, $value ) { function delete_site_option( $option ) { global $wpdb; - // ms_protect_special_option( $option ); @todo - /** * Fires immediately before a specific site option is deleted. * diff --git a/wp-includes/version.php b/wp-includes/version.php index 7e778778b5..d7a6df2f50 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.4-alpha-34755'; +$wp_version = '4.4-alpha-34756'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.