Changeset 11995

Timestamp:

10/03/2009 09:40:27 PM (14 years ago)

Author:

westi

Message:

Make the (add|get|update)_site_option functions run the same filters in WP as they do in mu. Fixes #10893.

File:

• trunk/wp-includes/functions.php (modified) (1 diff)

trunk/wp-includes/functions.php

@@ -3159 +3159 @@
 
 function get_site_option( $key, $default = false, $use_cache = true ) {
-    return get_option($key, $default);
+    // Allow plugins to short-circuit site options. 
+    $pre = apply_filters( 'pre_site_option_' . $key, false ); 
+    if ( false !== $pre ) 
+        return $pre; 
+ 
+    $value = get_option($key, $default);
+ 
+    return apply_filters( 'site_option_' . $key, $value );
 }
 
 // expects $key, $value not to be SQL escaped
 function add_site_option( $key, $value ) {
-    return add_option($key, $value);
+    $value = apply_filters( 'pre_add_site_option_' . $key, $value );
+    $result =  add_option($key, $value);
+    do_action( "add_site_option_{$key}", $key, $value );
+    return $result;
 }
 
 // expects $key, $value not to be SQL escaped
 function update_site_option( $key, $value ) {
-    return update_option($key, $value);
+    $oldvalue = get_site_option( $key );
+    $value = apply_filters( 'pre_update_site_option_' . $key, $value, $oldvalue );
+    $result = update_option($key, $value);
+    do_action( "update_site_option_{$key}", $key, $value );
+    return $result;
 }