From 895794f74d091efc962ffcbe38b6d5ba2b4f236b Mon Sep 17 00:00:00 2001 From: Scott Taylor Date: Fri, 16 Jan 2015 17:23:22 +0000 Subject: [PATCH] In `WP_Filesystem_Base` subclasses that set `$wp_base`, remove this dead code. Unused since [8009] - "Make WP_Filesystem work with new directory constants" There is currently no declared field and no `@property` annotation. See #30799. Built from https://develop.svn.wordpress.org/trunk@31209 git-svn-id: http://core.svn.wordpress.org/trunk@31190 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-filesystem-ftpext.php | 3 --- wp-admin/includes/class-wp-filesystem-ftpsockets.php | 3 --- wp-admin/includes/class-wp-filesystem-ssh2.php | 3 --- wp-includes/version.php | 2 +- 4 files changed, 1 insertion(+), 10 deletions(-) diff --git a/wp-admin/includes/class-wp-filesystem-ftpext.php b/wp-admin/includes/class-wp-filesystem-ftpext.php index b95dc45109..b4809d4b0d 100644 --- a/wp-admin/includes/class-wp-filesystem-ftpext.php +++ b/wp-admin/includes/class-wp-filesystem-ftpext.php @@ -42,9 +42,6 @@ class WP_Filesystem_FTPext extends WP_Filesystem_Base { else $this->options['hostname'] = $opt['hostname']; - if ( ! empty($opt['base']) ) - $this->wp_base = $opt['base']; - // Check if the options provided are OK. if ( empty($opt['username']) ) $this->errors->add('empty_username', __('FTP username is required')); diff --git a/wp-admin/includes/class-wp-filesystem-ftpsockets.php b/wp-admin/includes/class-wp-filesystem-ftpsockets.php index 19bdb84d9f..d61766da04 100644 --- a/wp-admin/includes/class-wp-filesystem-ftpsockets.php +++ b/wp-admin/includes/class-wp-filesystem-ftpsockets.php @@ -37,9 +37,6 @@ class WP_Filesystem_ftpsockets extends WP_Filesystem_Base { else $this->options['hostname'] = $opt['hostname']; - if ( ! empty($opt['base']) ) - $this->wp_base = $opt['base']; - // Check if the options provided are OK. if ( empty ($opt['username']) ) $this->errors->add('empty_username', __('FTP username is required')); diff --git a/wp-admin/includes/class-wp-filesystem-ssh2.php b/wp-admin/includes/class-wp-filesystem-ssh2.php index 7436d005d5..8f0147e1e1 100644 --- a/wp-admin/includes/class-wp-filesystem-ssh2.php +++ b/wp-admin/includes/class-wp-filesystem-ssh2.php @@ -64,9 +64,6 @@ class WP_Filesystem_SSH2 extends WP_Filesystem_Base { else $this->options['hostname'] = $opt['hostname']; - if ( ! empty($opt['base']) ) - $this->wp_base = $opt['base']; - // Check if the options provided are OK. if ( !empty ($opt['public_key']) && !empty ($opt['private_key']) ) { $this->options['public_key'] = $opt['public_key']; diff --git a/wp-includes/version.php b/wp-includes/version.php index d1b498fcde..2dd5951803 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.2-alpha-31208'; +$wp_version = '4.2-alpha-31209'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.