From ee489a2e81929f2fe6f448b3c3119bab0be42afe Mon Sep 17 00:00:00 2001
From: Andrew Nacin <wp@andrewnacin.com>
Date: Fri, 18 Oct 2013 21:24:10 +0000
Subject: [PATCH] Commit [25823] should not have renamed
 AUTOMATIC_UPDATER_DISABLED to AUTOMATIC_UPDATES_DISABLED.

The proper constant is AUTOMATIC_UPDATER_DISABLED. Keep the filter in line with that too.

see #22704.

Built from https://develop.svn.wordpress.org/trunk@25851


git-svn-id: http://core.svn.wordpress.org/trunk@25763 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-upgrader.php | 4 ++--
 wp-includes/version.php                 | 2 +-
 2 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php
index 39d231cf38..2cd064822f 100644
--- a/wp-admin/includes/class-wp-upgrader.php
+++ b/wp-admin/includes/class-wp-upgrader.php
@@ -1585,9 +1585,9 @@ class WP_Automatic_Updater {
 			return true;
 
 		// More fine grained control can be done through the WP_AUTO_UPDATE_CORE constant and filters.
-		$disabled = defined( 'AUTOMATIC_UPDATES_DISABLED' ) && AUTOMATIC_UPDATES_DISABLED;
+		$disabled = defined( 'AUTOMATIC_UPDATER_DISABLED' ) && AUTOMATIC_UPDATER_DISABLED;
 
-		return apply_filters( 'automatic_updates_disabled', $disabled );
+		return apply_filters( 'automatic_updater_disabled', $disabled );
 	}
 
 	/**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e28962d6c6..54f8d1a1dc 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '3.7-RC1';
+$wp_version = '3.7-RC1-25851';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.