Ticket #44042: 44042.2.diff

src/wp-includes/option.php

@@ -549 +549 @@
 function delete_option( $option ) {
         global $wpdb;
 
-        $option = trim( $option );
+        /**
+         * Filters the option name before the option gets deleted.
+         * 
+         * Returning an empty string short circuits the function.
+         * 
+         * @since 5.3.0
+         * 
+         * @param string $option Option name.
+         */
+        $option = trim( apply_filters( 'pre_delete_option', $option ) );
+
         if ( empty( $option ) ) {
                 return false;
         }

tests/phpunit/tests/option/option.php

@@ -140 +140 @@
                 $actual = $wpdb->get_row( $wpdb->prepare( "SELECT autoload FROM $wpdb->options WHERE option_name = %s LIMIT 1", $name ) );
                 $this->assertEquals( $expected, $actual->autoload );
         }
+
+        /**
+         * @ticket 44042
+         */
+        function test_pre_delete_option_filter() {
+                add_filter( 'pre_delete_option', function( $option ) {
+                        if ( 'test_option_test' === $option ) {
+                                $option = 'test_option';
+                        }
+                        
+                        return $option;
+                } );
+
+                add_option( 'test_option', '1' );
+                delete_option( 'test_option_test' );
+
+                $this->assertEquals( false, get_option( 'test_option' ) );
+
+        }
+
+        /**
+         * Returning an empty string in `pre_delete_option` short circuits `delete_option()`.
+         * 
+         * @ticket 44042
+         */
+        function test_pre_delete_option_short_circuit() {
+                add_filter( 'pre_delete_option', function( $option ) {
+                        if ( 'test_option' === $option ) {
+                                return '';
+                        }
+                } );
+
+                add_option( 'test_option', '5' );
+                delete_option( 'test_option' );
+
+                $this->assertEquals( '5', get_option( 'test_option' ) );
+        }
 }