From 0322d0e89bf2025e736a16d5ae41b453f033acad Mon Sep 17 00:00:00 2001 From: Drew Jaynes Date: Mon, 13 Jul 2015 19:46:25 +0000 Subject: [PATCH] Fix inline documentation syntax in the `WP_Upgrader->clear_destination()` method added in 4.3. See [32854]. See #32891. Built from https://develop.svn.wordpress.org/trunk@33209 git-svn-id: http://core.svn.wordpress.org/trunk@33181 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/class-wp-upgrader.php | 13 +++++++------ wp-includes/version.php | 2 +- 2 files changed, 8 insertions(+), 7 deletions(-) diff --git a/wp-admin/includes/class-wp-upgrader.php b/wp-admin/includes/class-wp-upgrader.php index 7f8ddc19c0..0ab08b6125 100644 --- a/wp-admin/includes/class-wp-upgrader.php +++ b/wp-admin/includes/class-wp-upgrader.php @@ -301,8 +301,7 @@ class WP_Upgrader { * @global WP_Filesystem_Base $wp_filesystem Subclass * * @param string $remote_destination The location on the remote filesystem to be cleared - * - * @return bool|WP_Error true upon success, {@see WP_Error} on failure. + * @return bool|WP_Error True upon success, WP_Error on failure. */ public function clear_destination( $remote_destination ) { global $wp_filesystem; @@ -311,11 +310,12 @@ class WP_Upgrader { return true; } - // Check all files are writable before attempting to clear the destination + // Check all files are writable before attempting to clear the destination. $unwritable_files = array(); $_files = $wp_filesystem->dirlist( $remote_destination, true, true ); - // Flatten the resulting array, iterate using each as we append to the array during iteration + + // Flatten the resulting array, iterate using each as we append to the array during iteration. while ( $f = each( $_files ) ) { $file = $f['value']; $name = $f['key']; @@ -329,10 +329,11 @@ class WP_Upgrader { } } - // Check writability + // Check writability. foreach ( $_files as $filename => $file_details ) { if ( ! $wp_filesystem->is_writable( $remote_destination . $filename ) ) { - // Attempt to alter permissions to allow writes and try again + + // Attempt to alter permissions to allow writes and try again. $wp_filesystem->chmod( $remote_destination . $filename, ( 'd' == $file_details['type'] ? FS_CHMOD_DIR : FS_CHMOD_FILE ) ); if ( ! $wp_filesystem->is_writable( $remote_destination . $filename ) ) { $unwritable_files[] = $filename; diff --git a/wp-includes/version.php b/wp-includes/version.php index 6d1df3b049..78c8d91013 100644 --- a/wp-includes/version.php +++ b/wp-includes/version.php @@ -4,7 +4,7 @@ * * @global string $wp_version */ -$wp_version = '4.3-beta2-33208'; +$wp_version = '4.3-beta2-33209'; /** * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.