From b29a20b90a1052ad80c6bf8d6c4df6cdfe3cfd04 Mon Sep 17 00:00:00 2001
From: Scott Taylor <scott.c.taylor@mac.com>
Date: Fri, 16 Jan 2015 17:10:43 +0000
Subject: [PATCH] `WP_Filesystem_Base` should declare `$errors` and `$options`
 as fields for use by subclasses.

See #30799.

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


git-svn-id: http://core.svn.wordpress.org/trunk@31189 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/class-wp-filesystem-base.php       | 4 ++++
 wp-admin/includes/class-wp-filesystem-ftpext.php     | 2 --
 wp-admin/includes/class-wp-filesystem-ftpsockets.php | 2 --
 wp-admin/includes/class-wp-filesystem-ssh2.php       | 2 --
 wp-includes/version.php                              | 2 +-
 5 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/wp-admin/includes/class-wp-filesystem-base.php b/wp-admin/includes/class-wp-filesystem-base.php
index 8e7328c102..ed9bb0de9e 100644
--- a/wp-admin/includes/class-wp-filesystem-base.php
+++ b/wp-admin/includes/class-wp-filesystem-base.php
@@ -38,6 +38,10 @@ class WP_Filesystem_Base {
 	 */
 	public $method = '';
 
+	public $errors = null;
+
+	public $options = array();
+
 	/**
 	 * Return the path on the remote filesystem of ABSPATH.
 	 *
diff --git a/wp-admin/includes/class-wp-filesystem-ftpext.php b/wp-admin/includes/class-wp-filesystem-ftpext.php
index 7a46eeab48..b95dc45109 100644
--- a/wp-admin/includes/class-wp-filesystem-ftpext.php
+++ b/wp-admin/includes/class-wp-filesystem-ftpext.php
@@ -16,8 +16,6 @@
  */
 class WP_Filesystem_FTPext extends WP_Filesystem_Base {
 	public $link;
-	public $errors = null;
-	public $options = array();
 
 	public function __construct($opt='') {
 		$this->method = 'ftpext';
diff --git a/wp-admin/includes/class-wp-filesystem-ftpsockets.php b/wp-admin/includes/class-wp-filesystem-ftpsockets.php
index 0d3b04bed0..19bdb84d9f 100644
--- a/wp-admin/includes/class-wp-filesystem-ftpsockets.php
+++ b/wp-admin/includes/class-wp-filesystem-ftpsockets.php
@@ -16,8 +16,6 @@
  */
 class WP_Filesystem_ftpsockets extends WP_Filesystem_Base {
 	public $ftp = false;
-	public $errors = null;
-	public $options = array();
 
 	public function __construct($opt = '') {
 		$this->method = 'ftpsockets';
diff --git a/wp-admin/includes/class-wp-filesystem-ssh2.php b/wp-admin/includes/class-wp-filesystem-ssh2.php
index 54ed2b9e4a..7436d005d5 100644
--- a/wp-admin/includes/class-wp-filesystem-ssh2.php
+++ b/wp-admin/includes/class-wp-filesystem-ssh2.php
@@ -38,8 +38,6 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base {
 	public $link = false;
 	public $sftp_link = false;
 	public $keys = false;
-	public $errors = array();
-	public $options = array();
 
 	public function __construct($opt='') {
 		$this->method = 'ssh2';
diff --git a/wp-includes/version.php b/wp-includes/version.php
index 924cd54391..d1b498fcde 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -4,7 +4,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '4.2-alpha-31207';
+$wp_version = '4.2-alpha-31208';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.