Changeset 27883 for branches/3.7/src/wp-admin/includes/class-wp-upgrader.php

Timestamp:

04/01/2014 03:28:09 AM (12 years ago)

Author:

nacin

Message:

Core Upgrader success statistics: Pass the version of WordPress we're upgrading from, as well as the version being upgraded to.

Merges [26016] and [26017] from 3.8 to the 3.7 branch.

fixes #25772.

Location:

branches/3.7

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/class-wp-upgrader.php (modified) (3 diffs)

branches/3.7/src/wp-admin/includes/class-wp-upgrader.php

@@ -1315 +1315 @@
 
     function upgrade( $current, $args = array() ) {
-        global $wp_filesystem, $wp_version;
+        global $wp_filesystem;
+
+        include ABSPATH . WPINC . '/version.php'; // $wp_version;
 
         $start_time = time();
@@ -1423 +1425 @@
                 'fs_method_forced' => defined( 'FS_METHOD' ) || has_filter( 'filesystem_method' ),
                 'time_taken'       => time() - $start_time,
+                'reported'         => $wp_version,
                 'attempted'        => $current->version,
             );
@@ -1901 +1904 @@
         // if the filesystem is unavailable, false is returned.
         if ( false === $upgrade_result ) {
-            $upgrade_result = new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.' ) );           
+            $upgrade_result = new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.' ) );
         }