From b0c6a64fbdd2130b75f67e2a797be69b857a320a Mon Sep 17 00:00:00 2001
From: Scott Taylor <wonderboymusic@git.wordpress.org>
Date: Fri, 16 Jan 2015 17:09:35 +0000
Subject: [PATCH] `WP_Filesystem_Base` should declare `$errors` and `$options`
 as fields for use by subclasses.

See #30799.


git-svn-id: https://develop.svn.wordpress.org/trunk@31208 602fd350-edb4-49c9-b593-d223f7449a82
---
 src/wp-admin/includes/class-wp-filesystem-base.php       | 4 ++++
 src/wp-admin/includes/class-wp-filesystem-ftpext.php     | 2 --
 src/wp-admin/includes/class-wp-filesystem-ftpsockets.php | 2 --
 src/wp-admin/includes/class-wp-filesystem-ssh2.php       | 2 --
 4 files changed, 4 insertions(+), 6 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-filesystem-base.php b/src/wp-admin/includes/class-wp-filesystem-base.php
index 8e7328c102..ed9bb0de9e 100644
--- a/src/wp-admin/includes/class-wp-filesystem-base.php
+++ b/src/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/src/wp-admin/includes/class-wp-filesystem-ftpext.php b/src/wp-admin/includes/class-wp-filesystem-ftpext.php
index 7a46eeab48..b95dc45109 100644
--- a/src/wp-admin/includes/class-wp-filesystem-ftpext.php
+++ b/src/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/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php b/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php
index 0d3b04bed0..19bdb84d9f 100644
--- a/src/wp-admin/includes/class-wp-filesystem-ftpsockets.php
+++ b/src/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/src/wp-admin/includes/class-wp-filesystem-ssh2.php b/src/wp-admin/includes/class-wp-filesystem-ssh2.php
index 54ed2b9e4a..7436d005d5 100644
--- a/src/wp-admin/includes/class-wp-filesystem-ssh2.php
+++ b/src/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';