Ticket #26664: 26664.2.diff

src/wp-admin/css/dashboard.css

@@ -367 +367 @@
 
 #dashboard_right_now .main p {
         margin: 0;
+        overflow: hidden;
 }
 
+#dashboard_right_now #wp-version-message .button {
+        float: right;
+}
+
 .mu-storage {
         overflow: hidden;
 }

src/wp-admin/includes/dashboard.php

@@ -233 +233 @@
 
         ?>
         </ul>
-        <p><?php printf( __( 'WordPress %1$s running %2$s theme.' ), get_bloginfo( 'version', 'display' ), $theme_name ); ?></p>
         <?php
+        update_right_now_message();
 
         // Check if search engines are asked not to index this site.
         if ( ! is_network_admin() && ! is_user_admin() && current_user_can( 'manage_options' ) && '1' != get_option( 'blog_public' ) ) {

src/wp-admin/includes/update.php

@@ -221 +221 @@
 
 // Called directly from dashboard
 function update_right_now_message() {
-        $msg = sprintf( __( 'You are using <span class="b">WordPress %s</span>.' ), get_bloginfo( 'version', 'display' ) );
+        $theme_name = wp_get_theme();
+        if ( current_user_can( 'switch_themes' ) ) {
+                $theme_name = sprintf( '<a href="themes.php">%1$s</a>', $theme_name );
+        }
 
+        $msg = sprintf( __( 'WordPress %1$s running %2$s theme.' ), get_bloginfo( 'version', 'display' ), $theme_name );
+
         if ( current_user_can('update_core') ) {
                 $cur = get_preferred_from_update_core();
 
@@ -230 +235 @@
                         $msg .= " <a href='" . network_admin_url( 'update-core.php' ) . "' class='button'>" . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a>';
         }
 
-        echo "<span id='wp-version-message'>$msg</span>";
+        echo "<p id='wp-version-message'>$msg</p>";
 }
 
 function get_plugin_updates() {