Ticket #50413: approach-1.diff

src/wp-includes/option.php

@@ -35 +35 @@
                 return false;
         }
 
+        /*
+         * Until a proper _deprecated_option() function can be introduced, redirect requests
+         * to deprecated keys to the new, correct ones.
+         */
+        $deprecated_keys = array(
+                'blacklist_keys'    => 'blocklist_keys',
+                'comment_whitelist' => 'comment_previously_approved',
+        );
+
+        if ( ! wp_installing() && isset( $deprecated_keys[ $option ] ) ) {
+                _doing_it_wrong(
+                        sprintf(
+                                __( '%s option' ),
+                                $option
+                        ),
+                        sprintf(
+                                __( 'This option key has been renamed to "%s".', '5.5.0' ),
+                                $deprecated_keys[ $option ]
+                        ),
+                        '5.5.0'
+                );
+                return get_option( $deprecated_keys[ $option ], $default );
+        }
+
         /**
          * Filters the value of an existing option before it is retrieved.
          *
@@ -313 +337 @@
                 return false;
         }
 
+        /*
+         * Until a proper _deprecated_option() function can be introduced, redirect requests
+         * to deprecated keys to the new, correct ones.
+         */
+        $deprecated_keys = array(
+                'blacklist_keys'    => 'blocklist_keys',
+                'comment_whitelist' => 'comment_previously_approved',
+        );
+
+        if ( ! wp_installing() && isset( $deprecated_keys[ $option ] ) ) {
+                _doing_it_wrong(
+                        sprintf(
+                                __( '%s option' ),
+                                $option
+                        ),
+                        sprintf(
+                                __( 'This option key has been renamed to "%s".', '5.5.0' ),
+                                $deprecated_keys[ $option ]
+                        ),
+                        '5.5.0'
+                );
+                return update_option( $deprecated_keys[ $option ], $value, $autoload );
+        }
+
         wp_protect_special_option( $option );
 
         if ( is_object( $value ) ) {
@@ -477 +525 @@
                 return false;
         }
 
+        /*
+         * Until a proper _deprecated_option() function can be introduced, redirect requests
+         * to deprecated keys to the new, correct ones.
+         */
+        $deprecated_keys = array(
+                'blacklist_keys'    => 'blocklist_keys',
+                'comment_whitelist' => 'comment_previously_approved',
+        );
+
+        if ( ! wp_installing() && isset( $deprecated_keys[ $option ] ) ) {
+                _doing_it_wrong(
+                        sprintf(
+                                __( '%s option' ),
+                                $option
+                        ),
+                        sprintf(
+                                __( 'This option key has been renamed to "%s".', '5.5.0' ),
+                                $deprecated_keys[ $option ]
+                        ),
+                        '5.5.0'
+                );
+                return add_option( $deprecated_keys[ $option ], $value, $deprecated, $autoload );
+        }
+
         wp_protect_special_option( $option );
 
         if ( is_object( $value ) ) {