Changeset 38167

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.

Location:

trunk/src/wp-admin/includes

Files:

• ajax-actions.php (modified) (2 diffs)
• plugin.php (modified) (2 diffs)
• theme.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';

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();
 

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

@@ -24 +24 @@
         return false;
 
+    if ( empty( $redirect ) ) {
+        $redirect = wp_nonce_url('themes.php?action=delete&stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet);
+    }
+
     ob_start();
-    if ( empty( $redirect ) )
-        $redirect = wp_nonce_url('themes.php?action=delete&stylesheet=' . urlencode( $stylesheet ), 'delete-theme_' . $stylesheet);
-    if ( false === ($credentials = request_filesystem_credentials($redirect)) ) {
-        $data = ob_get_clean();
-
-        if ( ! empty($data) ){
+    $credentials = request_filesystem_credentials( $redirect );
+    $data = ob_get_clean();
+
+    if ( false === $credentials ) {
+        if ( ! empty( $data ) ){
             include_once( ABSPATH . 'wp-admin/admin-header.php');
             echo $data;
@@ -39 +42 @@
     }
 
-    if ( ! WP_Filesystem($credentials) ) {
-        request_filesystem_credentials($redirect, '', true); // Failed to connect, Error and request again
+    if ( ! WP_Filesystem( $credentials ) ) {
+        ob_start();
+        request_filesystem_credentials( $redirect, '', true ); // Failed to connect, Error and request again.
         $data = ob_get_clean();