Changeset 38167 for trunk/src/wp-admin/includes/theme.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/theme.php (modified) (2 diffs)

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