Ticket #18629: 18629.2.patch

wp-admin/includes/update.php

@@ -86 +86 @@
                 return false;
 
         if ( !current_user_can('update_core') )
-                return sprintf( __( 'Version %s' ), $GLOBALS['wp_version'] );
+                return sprintf( __( 'Version %s' ), get_bloginfo('version', 'display') );
 
         $cur = get_preferred_from_update_core();
         if ( ! isset( $cur->current ) )
@@ -100 +100 @@
 
         switch ( $cur->response ) {
         case 'development' :
-                return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), $GLOBALS['wp_version'], network_admin_url( 'update-core.php' ) );
+                return sprintf( __( 'You are using a development version (%1$s). Cool! Please <a href="%2$s">stay updated</a>.' ), get_bloginfo('version', 'display'), network_admin_url( 'update-core.php' ) );
         break;
 
         case 'upgrade' :
@@ -109 +109 @@
 
         case 'latest' :
         default :
-                return sprintf( __( 'Version %s' ), $GLOBALS['wp_version'] );
+                return sprintf( __( 'Version %s' ), get_bloginfo('version', 'display') );
         break;
         }
 }
@@ -145 +145 @@
 
         $cur = get_preferred_from_update_core();
 
-        $msg = sprintf( __('You are using <span class="b">WordPress %s</span>.'), $GLOBALS['wp_version'] );
+        $msg = sprintf( __('You are using <span class="b">WordPress %s</span>.'), get_bloginfo('version', 'display') );
 
         if ( isset( $cur->response ) && $cur->response == 'upgrade' && current_user_can('update_core') ) {
                 $msg .= " <a href='" . network_admin_url( 'update-core.php' ) . "' class='button'>" . sprintf( __('Update to %s'), $cur->current ? $cur->current : __( 'Latest' ) ) . '</a>';
@@ -154 +154 @@
         echo "<span id='wp-version-message'>$msg</span>";
 }
 
+/**
+ * Adds SVN revision to WordPress version, if appropriate
+ */
+function get_svn_revision( $output, $show ) {
+        if ( 'version' == $show && is_super_admin() && file_exists( ABSPATH . '.svn/entries' ) && $svn = file( ABSPATH . '.svn/entries' ) )
+                $output .= '-r' . trim( $svn[3] );
+
+        return $output;
+}
+add_filter( 'bloginfo', 'get_svn_revision', 10, 2 );
+
 function get_plugin_updates() {
         $all_plugins = get_plugins();
         $upgrade_plugins = array();