diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php index 410df8dafc..35f6ef77e0 100644 --- a/wp-admin/includes/ms.php +++ b/wp-admin/includes/ms.php @@ -132,7 +132,7 @@ function wpmu_delete_user($id) { $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->users WHERE ID = %d", $id) ); $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE user_id = %d", $id) ); - clean_user_cache($id); + clean_user_cache($id); // allow for commit transaction do_action('deleted_user', $id); @@ -385,25 +385,27 @@ function display_space_usage() { // Display File upload quota on dashboard function dashboard_quota() { - if ( get_site_option( 'upload_space_check_disabled' ) ) { + if ( get_site_option( 'upload_space_check_disabled' ) ) return true; - } + $quota = get_space_allowed(); $used = get_dirsize( BLOGUPLOADDIR )/1024/1024; - if ($used > $quota) $percentused = '100'; - else $percentused = ( $used / $quota ) * 100; + if ( $used > $quota ) + $percentused = '100'; + else + $percentused = ( $used / $quota ) * 100; $percentused = number_format($percentused); $used = round($used,2); $used_color = ($used < 70) ? (($used >= 40) ? 'waiting' : 'approved') : 'spam'; ?> -

»"); ?>

+

- + -
%sMB' ), $quota ); ?>%sMB' ), $quota ); ?> %1sMB (%2s%%)' ), $used, $percentused ); ?> + %1sMB (%2s%%)' ), $used, $percentused ); ?>
@@ -698,11 +700,11 @@ function admin_notice_feed() { $item = $rss->get_item(); if ( !is_null( $item ) ) { $title = $item->get_title(); - if ( md5( $title ) == get_user_option( 'admin_feed_dismiss', $current_user->id ) ) + if ( md5( $title ) == get_user_option( 'admin_feed_dismiss', $current_user->id ) ) return; $msg = "

" . esc_html( $title ) . "

\n"; $content = $item->get_description(); - if ( is_null( $content ) ) + if ( is_null( $content ) ) $content = __( 'something' ); $content = wp_html_excerpt($content, 200) . ' ...';