summaryrefslogtreecommitdiffstats
path: root/wp-inst/wp-includes/functions.php
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-02-21 12:59:22 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2006-02-21 12:59:22 +0000
commit433d32693df5a6957c577fde7383c2d8174fc06e (patch)
tree908a0ea48cde229c7aba6d6bb5aee1229c624a04 /wp-inst/wp-includes/functions.php
parent0d11319eaf16b05640c9393ef1be7a3d9c1cd4e9 (diff)
downloadwordpress-mu-433d32693df5a6957c577fde7383c2d8174fc06e.tar.gz
wordpress-mu-433d32693df5a6957c577fde7383c2d8174fc06e.tar.xz
wordpress-mu-433d32693df5a6957c577fde7383c2d8174fc06e.zip
WP Merge
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@532 7be80a69-a1ef-0310-a953-fb0f7c49ff36
Diffstat (limited to 'wp-inst/wp-includes/functions.php')
-rw-r--r--wp-inst/wp-includes/functions.php9
1 files changed, 7 insertions, 2 deletions
diff --git a/wp-inst/wp-includes/functions.php b/wp-inst/wp-includes/functions.php
index 3d93ad8..173b632 100644
--- a/wp-inst/wp-includes/functions.php
+++ b/wp-inst/wp-includes/functions.php
@@ -2288,7 +2288,6 @@ function update_usermeta( $user_id, $meta_key, $meta_value ) {
wp_cache_delete($user_id, 'users');
wp_cache_delete($user->user_login, 'userlogins');
wp_cache_delete( md5($user_id . $meta_key), 'usermeta' );
-
return true;
}
@@ -2387,7 +2386,7 @@ function wp_cron() {
return;
foreach ($crons as $timestamp => $cronhooks) {
- if ($timestamp > time()) break;
+ if ($timestamp > current_time( 'timestamp' )) break;
foreach($cronhooks as $hook => $args) {
do_action($hook, $args['args']);
$recurrence = $args['recur'];
@@ -2404,4 +2403,10 @@ function wp_cron() {
}
}
+function privacy_ping_filter( $sites ) {
+ if ( get_option('blog_public') )
+ return $sites;
+ else
+ return '';
+}
?>