summaryrefslogtreecommitdiffstats
path: root/wp-includes
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-01-30 21:02:47 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2007-01-30 21:02:47 +0000
commit2af62b45328bed8acc4c2484964722eed237c665 (patch)
tree0165f3dffa44a95dc59c5c9f5448b08495700b54 /wp-includes
parent006898584b668bc04aeff31f8180d048e6ca4071 (diff)
downloadwordpress-mu-2af62b45328bed8acc4c2484964722eed237c665.tar.gz
wordpress-mu-2af62b45328bed8acc4c2484964722eed237c665.tar.xz
wordpress-mu-2af62b45328bed8acc4c2484964722eed237c665.zip
WP Merge to 4844
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@874 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-includes')
-rw-r--r--wp-includes/functions.php1
1 files changed, 1 insertions, 0 deletions
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index e271370..de60099 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -203,6 +203,7 @@ function is_serialized_string($data) {
function get_option($setting) {
global $wpdb, $switched, $current_blog;
+ // Allow plugins to short-circuit options.
$pre = apply_filters( 'pre_option_' . $setting, false );
if ( $pre )
return $pre;