From 433d32693df5a6957c577fde7383c2d8174fc06e Mon Sep 17 00:00:00 2001
From: donncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>
Date: Tue, 21 Feb 2006 12:59:22 +0000
Subject: WP Merge

git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@532 7be80a69-a1ef-0310-a953-fb0f7c49ff36
---
 wp-inst/wp-includes/functions.php | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

(limited to 'wp-inst/wp-includes/functions.php')

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 '';
+}
 ?>
-- 
cgit