Ticket #20651: 20651.diff

wp-includes/option.php

@@ -366 +366 @@
         $row = $wpdb->get_row( $wpdb->prepare( "SELECT autoload FROM $wpdb->options WHERE option_name = %s", $option ) );
         if ( is_null( $row ) )
                 return false;
+
+        do_action( 'pre_delete_option_' . $option );
         do_action( 'delete_option', $option );
+
         $result = $wpdb->delete( $wpdb->options, array( 'option_name' => $option ) );
         if ( ! defined( 'WP_INSTALLING' ) ) {
                 if ( 'yes' == $row->autoload ) {
@@ -846 +849 @@
 
         // ms_protect_special_option( $option ); @todo
 
-        do_action( 'pre_delete_site_option_' . $option );
-
         if ( !is_multisite() ) {
                 $result = delete_option( $option );
         } else {
                 $row = $wpdb->get_row( $wpdb->prepare( "SELECT meta_id FROM {$wpdb->sitemeta} WHERE meta_key = %s AND site_id = %d", $option, $wpdb->siteid ) );
                 if ( is_null( $row ) || !$row->meta_id )
                         return false;
+
+                do_action( 'pre_delete_site_option_' . $option );
+                do_action( 'pre_delete_site_option' );
+
                 $cache_key = "{$wpdb->siteid}:$option";
                 wp_cache_delete( $cache_key, 'site-options' );