Changeset 41805 for trunk/src/wp-includes/load.php

Timestamp:

10/10/2017 05:26:53 AM (9 years ago)

Author:

westonruter

Message:

File Editor: Increase robustness of fatal error checking when saving PHP file edits.

• Increase PHP execution time limit prior to issuing loopback requests where are themselves given timeouts to ensure PHP file can be reverted.
• Output scrape messages on success and failure so that absence of either can also be flagged as an error condition.
• Forward browser's HTTP Basic Auth credentials in loopback requests to admin and home URL.
• Display more helpful message when loopback request fails.

Amends [41721].
See #21622.
Fixes #42102.

File:

• trunk/src/wp-includes/load.php (modified) (2 diffs)

trunk/src/wp-includes/load.php

@@ -1127 +1127 @@
 
         if ( get_transient( 'scrape_key_' . $key ) !== $nonce ) {
-                echo "###### begin_scraped_error:$key ######";
+                echo "###### wp_scraping_result_start:$key ######";
                 echo wp_json_encode( array(
                         'code' => 'scrape_nonce_failure',
                         'message' => __( 'Scrape nonce check failed. Please try again.' ),
                 ) );
+                echo "###### wp_scraping_result_end:$key ######";
                 die();
         }
@@ -1146 +1147 @@
 function wp_finalize_scraping_edited_file_errors( $scrape_key ) {
         $error = error_get_last();
-        if ( empty( $error ) ) {
-                return;
-        }
-        if ( ! in_array( $error['type'], array( E_CORE_ERROR, E_COMPILE_ERROR, E_ERROR, E_PARSE, E_USER_ERROR, E_RECOVERABLE_ERROR ), true ) ) {
-                return;
-        }
-        $error = str_replace( ABSPATH, '', $error );
-        echo "###### begin_scraped_error:$scrape_key ######";
-        echo wp_json_encode( $error );
-}
+        echo "\n###### wp_scraping_result_start:$scrape_key ######\n";
+        if ( ! empty( $error ) && in_array( $error['type'], array( E_CORE_ERROR, E_COMPILE_ERROR, E_ERROR, E_PARSE, E_USER_ERROR, E_RECOVERABLE_ERROR ), true ) ) {
+                $error = str_replace( ABSPATH, '', $error );
+                echo wp_json_encode( $error );
+        } else {
+                echo wp_json_encode( true );
+        }
+        echo "\n###### wp_scraping_result_end:$scrape_key ######\n";
+}