From 3fc8778359827916071108c9b4ebd05a19dbc2d4 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Sat, 1 Nov 2014 23:03:22 +0000
Subject: [PATCH] Declare the `$options` property for `WP_Upgrader_Skin`.

See #30224.

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


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

diff --git a/wp-admin/includes/class-wp-upgrader-skins.php b/wp-admin/includes/class-wp-upgrader-skins.php
index 8fcee68f3c..03fffa8af9 100644
--- a/wp-admin/includes/class-wp-upgrader-skins.php
+++ b/wp-admin/includes/class-wp-upgrader-skins.php
@@ -20,6 +20,7 @@ class WP_Upgrader_Skin {
 	public $done_header = false;
 	public $done_footer = false;
 	public $result = false;
+	public $options = array();
 
 	public function __construct($args = array()) {
 		$defaults = array( 'url' => '', 'nonce' => '', 'title' => '', 'context' => false );
diff --git a/wp-includes/version.php b/wp-includes/version.php
index eb444c8d75..f79eb7827d 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.1-alpha-30169';
+$wp_version = '4.1-alpha-30170';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.