WordPress.org
Get WordPress

Make WordPress Core

Ticket #51087: 51087.diff

File 51087.diff, 4.1 KB (added by pbiron, 5 years ago)

  • src/wp-admin/includes/class-wp-filesystem-base.php 

    From 9232a0a5cb1a446151c8732e2572baf933c4307d Mon Sep 17 00:00:00 2001
From: Paul Biron <paul@sparrowhawkcomputing.com>
Date: Thu, 20 Aug 2020 17:36:21 -0600
Subject: [PATCH] Correct references to non-existent class:  WP_Filesystem
 should be WP_Filestem_Base.

---
 .../includes/class-wp-filesystem-base.php     | 28 +++++++++----------
 src/wp-admin/includes/class-wp-upgrader.php   |  4 +--
 2 files changed, 16 insertions(+), 16 deletions(-)

diff --git a/src/wp-admin/includes/class-wp-filesystem-base.php b/src/wp-admin/includes/class-wp-filesystem-base.php
index 170a2444f4..11c9390545 100644
    a b class WP_Filesystem_Base { 
    122122         * Locates a folder on the remote filesystem.
    123123         *
    124124         * @since 2.5.0
    125          * @deprecated 2.7.0 use WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir() instead.
    126          * @see WP_Filesystem::abspath()
    127          * @see WP_Filesystem::wp_content_dir()
    128          * @see WP_Filesystem::wp_plugins_dir()
    129          * @see WP_Filesystem::wp_themes_dir()
    130          * @see WP_Filesystem::wp_lang_dir()
     125         * @deprecated 2.7.0 use WP_Filesystem_Base::abspath() or WP_Filesystem_Base::wp_*_dir() instead.
     126         * @see WP_Filesystem_Base::abspath()
     127         * @see WP_Filesystem_Base::wp_content_dir()
     128         * @see WP_Filesystem_Base::wp_plugins_dir()
     129         * @see WP_Filesystem_Base::wp_themes_dir()
     130         * @see WP_Filesystem_Base::wp_lang_dir()
    131131         *
    132132         * @param string $base The folder to start searching from.
    133133         * @param bool   $echo True to display debug information.
    … … class WP_Filesystem_Base { 
    135135         * @return string The location of the remote path.
    136136         */
    137137        public function find_base_dir( $base = '.', $echo = false ) {
    138                 _deprecated_function( __FUNCTION__, '2.7.0', 'WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir()' );
     138                _deprecated_function( __FUNCTION__, '2.7.0', 'WP_Filesystem_Base::abspath() or WP_Filesystem_Base::wp_*_dir()' );
    139139                $this->verbose = $echo;
    140140                return $this->abspath();
    141141        }
    … … class WP_Filesystem_Base { 
    144144         * Locates a folder on the remote filesystem.
    145145         *
    146146         * @since 2.5.0
    147          * @deprecated 2.7.0 use WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir() methods instead.
    148          * @see WP_Filesystem::abspath()
    149          * @see WP_Filesystem::wp_content_dir()
    150          * @see WP_Filesystem::wp_plugins_dir()
    151          * @see WP_Filesystem::wp_themes_dir()
    152          * @see WP_Filesystem::wp_lang_dir()
     147         * @deprecated 2.7.0 use WP_Filesystem_Base::abspath() or WP_Filesystem_Base::wp_*_dir() methods instead.
     148         * @see WP_Filesystem_Base::abspath()
     149         * @see WP_Filesystem_Base::wp_content_dir()
     150         * @see WP_Filesystem_Base::wp_plugins_dir()
     151         * @see WP_Filesystem_Base::wp_themes_dir()
     152         * @see WP_Filesystem_Base::wp_lang_dir()
    153153         *
    154154         * @param string $base The folder to start searching from.
    155155         * @param bool   $echo True to display debug information.
    156156         * @return string The location of the remote path.
    157157         */
    158158        public function get_base_dir( $base = '.', $echo = false ) {
    159                 _deprecated_function( __FUNCTION__, '2.7.0', 'WP_Filesystem::abspath() or WP_Filesystem::wp_*_dir()' );
     159                _deprecated_function( __FUNCTION__, '2.7.0', 'WP_Filesystem_Base::abspath() or WP_Filesystem_Base::wp_*_dir()' );
    160160                $this->verbose = $echo;
    161161                return $this->abspath();
    162162        }

  • src/wp-admin/includes/class-wp-upgrader.php 

    diff --git a/src/wp-admin/includes/class-wp-upgrader.php b/src/wp-admin/includes/class-wp-upgrader.php
index 2da3b7cb21..5faac56213 100644
    a b class WP_Upgrader { 
    344344        }
    345345
    346346        /**
    347          * Flatten the results of WP_Filesystem::dirlist() for iterating over.
     347         * Flatten the results of WP_Filesystem_Base::dirlist() for iterating over.
    348348         *
    349349         * @since 4.9.0
    350350         * @access protected
    351351         *
    352          * @param array  $nested_files Array of files as returned by WP_Filesystem::dirlist().
     352         * @param array  $nested_files Array of files as returned by WP_Filesystem_Base::dirlist().
    353353         * @param string $path         Relative path to prepend to child nodes. Optional.
    354354         * @return array A flattened array of the $nested_files specified.
    355355         */