From 7fec14f382c65a827da235192ef4e06d68e1d540 Mon Sep 17 00:00:00 2001
From: Dominik Schilling <dominikschilling+git@gmail.com>
Date: Wed, 10 Aug 2016 19:57:30 +0000
Subject: [PATCH] Upgrader: Rename `class-wp-automatic-upgrader.php` to
 `class-wp-automatic-updater.php`.

The class is named `WP_Automatic_Updater` not `WP_Automatic_Upgrader` like all the other upgrader classes.

Introduced in [37409].

Merge of [38242] to the 4.6 branch.

Props DrewAPicture for review.
Fixes #37628.
Built from https://develop.svn.wordpress.org/branches/4.6@38243


git-svn-id: http://core.svn.wordpress.org/branches/4.6@38184 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 ...-automatic-upgrader.php => class-wp-automatic-updater.php} | 0
 wp-admin/includes/class-wp-upgrader.php                       | 4 ++--
 wp-admin/includes/update-core.php                             | 2 ++
 wp-includes/version.php                                       | 2 +-
 4 files changed, 5 insertions(+), 3 deletions(-)
 rename wp-admin/includes/{class-wp-automatic-upgrader.php => class-wp-automatic-updater.php} (100%)

diff --git a/wp-admin/includes/class-wp-automatic-upgrader.php b/wp-admin/includes/class-wp-automatic-updater.php
similarity index 100%
rename from wp-admin/includes/class-wp-automatic-upgrader.php
rename to wp-admin/includes/class-wp-automatic-updater.php
diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php
index 2276152cc4..485197c49a 100644
--- a/wp-admin/includes/class-wp-upgrader.php
+++ b/wp-admin/includes/class-wp-upgrader.php
@@ -903,5 +903,5 @@ require_once ABSPATH . 'wp-admin/includes/class-core-upgrader.php';
 /** File_Upload_Upgrader class */
 require_once ABSPATH . 'wp-admin/includes/class-file-upload-upgrader.php';
 
-/** WP_Automatic_Upgrader class */
-require_once ABSPATH . 'wp-admin/includes/class-wp-automatic-upgrader.php';
+/** WP_Automatic_Updater class */
+require_once ABSPATH . 'wp-admin/includes/class-wp-automatic-updater.php';
diff --git a/wp-admin/includes/update-core.php b/wp-admin/includes/update-core.php
index 5933ba965d..a378d3ce95 100644
--- a/wp-admin/includes/update-core.php
+++ b/wp-admin/includes/update-core.php
@@ -703,6 +703,8 @@ $_old_files = array(
 'wp-includes/js/tinymce/plugins/wpfullscreen',
 // 4.5
 'wp-includes/theme-compat/comments-popup.php',
+// 4.6
+'wp-admin/includes/class-wp-automatic-upgrader.php', // Wrong file name, see #37628.
 );
 
 /**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 351baf6918..165e1ab9a7 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.6-RC1-38241';
+$wp_version = '4.6-RC1-38243';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.