Ticket #33858: options.patch

wp-includes/option.php

@@ -69 +69 @@
                          *                        in the database.
                          * @param string $option  Option name.
                          */
+
+                        $default = apply_filters('option', $default, $option);
+
                         return apply_filters( 'default_option_' . $option, $default, $option );
                 }
 
@@ -94 +97 @@
                                         wp_cache_set( 'notoptions', $notoptions, 'options' );
 
                                         /** This filter is documented in wp-includes/option.php */
+
+                                        $default = apply_filters('option', $default, $option);
+
                                         return apply_filters( 'default_option_' . $option, $default, $option );
                                 }
                         }
@@ -105 +111 @@
                 if ( is_object( $row ) ) {
                         $value = $row->option_value;
                 } else {
+
+                        $default = apply_filters('option', $default, $option);
+
                         /** This filter is documented in wp-includes/option.php */
                         return apply_filters( 'default_option_' . $option, $default, $option );
                 }
@@ -117 +126 @@
         if ( in_array( $option, array('siteurl', 'home', 'category_base', 'tag_base') ) )
                 $value = untrailingslashit( $value );
 
+        $value = apply_filters('option', maybe_unserialize( $value ), $option, $default);
+
         /**
          * Filter the value of an existing option.
          *
@@ -130 +141 @@
          *                       unserialized prior to being returned.
          * @param string $option Option name.
          */
-        return apply_filters( 'option_' . $option, maybe_unserialize( $value ), $option );
+        return apply_filters( 'option_' . $option, $value, $option );
 }
 
 /**