WordPress 4.1

[autoinstalls/wordpress.git] / wp-admin / includes / dashboard.php

diff --git a/wp-admin/includes/dashboard.php b/wp-admin/includes/dashboard.php
index 2a5e74bea4542d2b4786cec99e4eb0b9cfc745b0..bf37176bae3c0f5eb43513ec13c2861547dc127d 100644 (file)
--- a/wp-admin/includes/dashboard.php
+++ b/wp-admin/includes/dashboard.php
@@ -235,8 +235,8 @@ function wp_dashboard_right_now() {
        }
        // Comments
        $num_comm = wp_count_comments();
-       if ( $num_comm && $num_comm->total_comments ) {
-               $text = sprintf( _n( '%s Comment', '%s Comments', $num_comm->total_comments ), number_format_i18n( $num_comm->total_comments ) );
+       if ( $num_comm && $num_comm->approved ) {
+               $text = sprintf( _n( '%s Comment', '%s Comments', $num_comm->approved ), number_format_i18n( $num_comm->approved ) );
                ?>
                <li class="comment-count"><a href="edit-comments.php"><?php echo $text; ?></a></li>
                <?php
@@ -967,7 +967,7 @@ function wp_dashboard_primary() {
                         *
                         * @param string $link The widget's secondary link URL.
                         */
-                       'link' => apply_filters( 'dashboard_secondary_link', __( 'http://planet.wordpress.org/' ) ),
+                       'link' => apply_filters( 'dashboard_secondary_link', __( 'https://planet.wordpress.org/' ) ),
 
                        /**
                         * Filter the secondary feed URL for the 'WordPress News' dashboard widget.
@@ -976,7 +976,7 @@ function wp_dashboard_primary() {
                         *
                         * @param string $url The widget's secondary feed URL.
                         */
-                       'url' => apply_filters( 'dashboard_secondary_feed', __( 'http://planet.wordpress.org/feed/' ) ),
+                       'url' => apply_filters( 'dashboard_secondary_feed', __( 'https://planet.wordpress.org/feed/' ) ),
 
                        /**
                         * Filter the secondary link title for the 'WordPress News' dashboard widget.
@@ -1111,7 +1111,7 @@ function wp_dashboard_plugins_output( $rss, $args = array() ) {
  *
  * @since 3.0.0
  *
- * @return bool True if not multisite, user can't upload files, or the space check option is disabled.
+ * @return bool|null True if not multisite, user can't upload files, or the space check option is disabled.
 */
 function wp_dashboard_quota() {
        if ( !is_multisite() || !current_user_can( 'upload_files' ) || get_site_option( 'upload_space_check_disabled' ) )