Ticket #18629: 18629.4.patch

wp-admin/includes/update.php

@@ -83 +83 @@
 
 function core_update_footer( $msg = '' ) {
         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 ( ! is_object( $cur ) )
@@ -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;
         }
 }
@@ -140 +140 @@
 
 // Called directly from dashboard
 function update_right_now_message() {
-        $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 ( current_user_can('update_core') ) {
                 $cur = get_preferred_from_update_core();
@@ -152 +152 @@
         echo "<span id='wp-version-message'>$msg</span>";
 }
 
+/**
+ * Adds SVN revision to WordPress version, if appropriate
+ *
+ * @since 3.5.0
+ */
+function get_svn_revision( $output, $show ) {
+        if ( 'version' != $show || ! current_user_can( 'update_core' ) || false === strpos( $output, '-' ) )
+                return $output;
+
+        if ( file_exists( ABSPATH . '.svn/entries' ) && $svn = file( ABSPATH . '.svn/entries' ) && isset( $svn[3] ) ) {
+                $output = preg_replace ( '/-[0-9]+$/', '', $output );
+                $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();