diff --git a/wp-admin/index.php b/wp-admin/index.php index 1761f20c52..f48fccfcbe 100644 --- a/wp-admin/index.php +++ b/wp-admin/index.php @@ -4,7 +4,7 @@ $title = __('Dashboard'); require_once('admin-header.php'); require_once (ABSPATH . WPINC . '/rss-functions.php'); -$today = current_time('mysql'); +$today = current_time('mysql', 1); ?>
@@ -30,7 +30,7 @@ foreach ($recentposts as $post) { get_results("SELECT ID, post_title, post_date FROM $wpdb->posts WHERE post_status = 'publish' AND post_date_gmt > '$today'") ) : +if ( $scheduled = $wpdb->get_results("SELECT ID, post_title, post_date_gmt FROM $wpdb->posts WHERE post_status = 'publish' AND post_date_gmt > '$today'") ) : ?>

@@ -39,7 +39,7 @@ if ( $scheduled = $wpdb->get_results("SELECT ID, post_title, post_date FROM $wpd foreach ($scheduled as $post) { if ($post->post_title == '') $post->post_title = sprintf(__('Post #%s'), $post->ID); - echo "
  • $post->post_title in " . human_time_diff( time(), strtotime($post->post_date) ) . "
  • "; + echo "
  • $post->post_title in " . human_time_diff( time(), strtotime($post->post_date_gmt) ) . "
  • "; } ?> diff --git a/wp-includes/functions-formatting.php b/wp-includes/functions-formatting.php index 4057603105..95fa576cc9 100644 --- a/wp-includes/functions-formatting.php +++ b/wp-includes/functions-formatting.php @@ -556,7 +556,7 @@ function human_time_diff( $from, $to = '' ) { $diff = (int) ($to - $from); if ($diff <= 3600) { $mins = round($diff / 60); - $since = sprintf( __('%s mins', $mins) ); + $since = sprintf( __('%s mins'), $mins); } else if (($diff <= 86400) && ($diff > 3600)) { $hours = round($diff / 3600); if ($hours <= 1) diff --git a/wp-settings.php b/wp-settings.php index 96ad239590..2f74a4d6ca 100644 --- a/wp-settings.php +++ b/wp-settings.php @@ -58,6 +58,12 @@ $tableoptions = $wpdb->options; $tablepostmeta = $wpdb->postmeta; require (ABSPATH . WPINC . '/functions.php'); + +$wpdb->hide_errors(); +if ( !update_user_cache() && !strstr($_SERVER['PHP_SELF'], 'install.php') ) + die("It doesn't look like you've installed WP yet. Try running install.php."); +$wpdb->show_errors(); + require (ABSPATH . WPINC . '/functions-formatting.php'); require (ABSPATH . WPINC . '/functions-post.php'); require (ABSPATH . WPINC . '/classes.php'); @@ -67,11 +73,6 @@ require (ABSPATH . WPINC . '/kses.php'); require_once (ABSPATH . WPINC . '/wp-l10n.php'); -$wpdb->hide_errors(); -if ( !update_user_cache() && !strstr($_SERVER['PHP_SELF'], 'install.php') ) - die("It doesn't look like you've installed WP yet. Try running install.php."); -$wpdb->show_errors(); - if (!strstr($_SERVER['PHP_SELF'], 'install.php') && !strstr($_SERVER['PHP_SELF'], 'wp-admin/import')) : $querystring_start = '?'; $querystring_equal = '=';