Changeset 38167 for trunk/src/wp-admin/includes/ajax-actions.php

Timestamp:

07/27/2016 05:09:27 PM (8 years ago)

Author:

ocean90

Message:

Filesystem API: Output buffering for request_filesystem_credentials() should wrap the function directly.

Previously ob_end_clean() was only called when the previous condition was successful which led to unexpected results when another output buffering was involved, like PHPUnit's.

Fixes #37488.

File:

• trunk/src/wp-admin/includes/ajax-actions.php (modified) (2 diffs)

trunk/src/wp-admin/includes/ajax-actions.php

@@ -3516 +3516 @@
     }
 
-    // Check filesystem credentials. `delete_plugins()` will bail otherwise.
+    // Check filesystem credentials. `delete_theme()` will bail otherwise.
+    $url = wp_nonce_url( 'themes.php?action=delete&stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet );
     ob_start();
-    $url = wp_nonce_url( 'themes.php?action=delete&stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet );
-    if ( false === ( $credentials = request_filesystem_credentials( $url ) ) || ! WP_Filesystem( $credentials ) ) {
+    $credentials = request_filesystem_credentials( $url );
+    ob_end_clean();
+    if ( false === $credentials || ! WP_Filesystem( $credentials ) ) {
         global $wp_filesystem;
-        ob_end_clean();
 
         $status['errorCode']    = 'unable_to_connect_to_filesystem';
@@ -3772 +3773 @@
 
     // Check filesystem credentials. `delete_plugins()` will bail otherwise.
+    $url = wp_nonce_url( 'plugins.php?action=delete-selected&verify-delete=1&checked[]=' . $plugin, 'bulk-plugins' );
     ob_start();
-    $url = wp_nonce_url( 'plugins.php?action=delete-selected&verify-delete=1&checked[]=' . $plugin, 'bulk-plugins' );
-    if ( false === ( $credentials = request_filesystem_credentials( $url ) ) || ! WP_Filesystem( $credentials ) ) {
+    $credentials = request_filesystem_credentials( $url );
+    ob_end_clean();
+    if ( false === $credentials || ! WP_Filesystem( $credentials ) ) {
         global $wp_filesystem;
-        ob_end_clean();
 
         $status['errorCode']    = 'unable_to_connect_to_filesystem';