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

Timestamp:

07/27/2016 05:09:27 PM (9 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/plugin.php (modified) (2 diffs)

trunk/src/wp-admin/includes/plugin.php

@@ -783 +783 @@
         $checked[] = 'checked[]=' . $plugin;
 
+    $url = wp_nonce_url('plugins.php?action=delete-selected&verify-delete=1&' . implode('&', $checked), 'bulk-plugins');
+
     ob_start();
-    $url = wp_nonce_url('plugins.php?action=delete-selected&verify-delete=1&' . implode('&', $checked), 'bulk-plugins');
-    if ( false === ($credentials = request_filesystem_credentials($url)) ) {
-        $data = ob_get_clean();
-
+    $credentials = request_filesystem_credentials( $url );
+    $data = ob_get_clean();
+
+    if ( false === $credentials ) {
         if ( ! empty($data) ){
             include_once( ABSPATH . 'wp-admin/admin-header.php');
@@ -797 +799 @@
     }
 
-    if ( ! WP_Filesystem($credentials) ) {
-        request_filesystem_credentials($url, '', true); //Failed to connect, Error and request again
+    if ( ! WP_Filesystem( $credentials ) ) {
+        ob_start();
+        request_filesystem_credentials( $url, '', true ); // Failed to connect, Error and request again.
         $data = ob_get_clean();