From d6ce5dd553729c55e0a477ad27b96f9e2b7ea39f Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Sat, 10 Jan 2015 05:42:22 +0000
Subject: [PATCH] `WP_Upgrader` will take any "skin" that is passed to it, and
 set `->skin` via composition. The default type of `->skin` is
 `WP_Upgrader_Skin`, which doesn't have methods declared for `->bulk_header()`
 and `->bulk_footer()`. Add noop methods to `WP_Upgrader_Skin`.

See #30799.

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


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

diff --git a/wp-admin/includes/class-wp-upgrader-skins.php b/wp-admin/includes/class-wp-upgrader-skins.php
index 6f34022069..42488d9a93 100644
--- a/wp-admin/includes/class-wp-upgrader-skins.php
+++ b/wp-admin/includes/class-wp-upgrader-skins.php
@@ -137,6 +137,9 @@ class WP_Upgrader_Skin {
 				</script>';
 		}
 	}
+
+	public function bulk_header() {}
+	public function bulk_footer() {}
 }
 
 /**
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 9dd924d616..aa910a41bd 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31121';
+$wp_version = '4.2-alpha-31122';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.