Ticket #35425: 35425.wp-admin.diff

src/wp-admin/includes/bookmark.php

@@ -197 +197 @@
         if ( $update ) {
                 if ( false === $wpdb->update( $wpdb->links, compact( 'link_url', 'link_name', 'link_image', 'link_target', 'link_description', 'link_visible', 'link_rating', 'link_rel', 'link_notes', 'link_rss' ), compact( 'link_id' ) ) ) {
                         if ( $wp_error ) {
-                                return new WP_Error( 'db_update_error', __( 'Could not update link in the database' ), $wpdb->last_error );
+                                return new WP_Error( 'db_update_error', __( 'Could not update link in the database' ), array( 'status' => 500, 'db_error' => $wpdb->last_error ) );
                         } else {
                                 return 0;
                         }
@@ -205 +205 @@
         } else {
                 if ( false === $wpdb->insert( $wpdb->links, compact( 'link_url', 'link_name', 'link_image', 'link_target', 'link_description', 'link_visible', 'link_owner', 'link_rating', 'link_rel', 'link_notes', 'link_rss' ) ) ) {
                         if ( $wp_error ) {
-                                return new WP_Error( 'db_insert_error', __( 'Could not insert link into the database' ), $wpdb->last_error );
+                                return new WP_Error( 'db_insert_error', __( 'Could not insert link into the database' ), array( 'status' => 500, 'db_error' => $wpdb->last_error ) );
                         } else {
                                 return 0;
                         }

src/wp-admin/includes/class-wp-press-this.php

@@ -259 +259 @@
                 global $wp_version;
 
                 if ( empty( $url ) ) {
-                        return new WP_Error( 'invalid-url', __( 'A valid URL was not provided.' ) );
+                        return new WP_Error( 'invalid-url', __( 'A valid URL was not provided.' ), array( 'status' => 404 ) );
                 }
 
                 $remote_url = wp_safe_remote_get( $url, array(

src/wp-admin/includes/class-wp-upgrader.php

@@ -178 +178 @@
                 }
 
                 if ( ! is_object($wp_filesystem) )
-                        return new WP_Error('fs_unavailable', $this->strings['fs_unavailable'] );
+                        return new WP_Error( 'fs_unavailable', $this->strings['fs_unavailable'], array( 'status' => 500 ) );
 
                 if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
-                        return new WP_Error('fs_error', $this->strings['fs_error'], $wp_filesystem->errors);
+                        return new WP_Error( 'fs_error', $this->strings['fs_error'], array( 'status' => 500, 'error' => $wp_filesystem->errors ) );
 
                 foreach ( (array)$directories as $dir ) {
                         switch ( $dir ) {
                                 case ABSPATH:
                                         if ( ! $wp_filesystem->abspath() )
-                                                return new WP_Error('fs_no_root_dir', $this->strings['fs_no_root_dir']);
+                                                return new WP_Error( 'fs_no_root_dir', $this->strings['fs_no_root_dir'], array( 'status' => 500 ) );
                                         break;
                                 case WP_CONTENT_DIR:
                                         if ( ! $wp_filesystem->wp_content_dir() )
-                                                return new WP_Error('fs_no_content_dir', $this->strings['fs_no_content_dir']);
+                                                return new WP_Error( 'fs_no_content_dir', $this->strings['fs_no_content_dir'], array( 'status' => 500 ) );
                                         break;
                                 case WP_PLUGIN_DIR:
                                         if ( ! $wp_filesystem->wp_plugins_dir() )
-                                                return new WP_Error('fs_no_plugins_dir', $this->strings['fs_no_plugins_dir']);
+                                                return new WP_Error( 'fs_no_plugins_dir', $this->strings['fs_no_plugins_dir'], array( 'status' => 500 ) );
                                         break;
                                 case get_theme_root():
                                         if ( ! $wp_filesystem->wp_themes_dir() )
-                                                return new WP_Error('fs_no_themes_dir', $this->strings['fs_no_themes_dir']);
+                                                return new WP_Error( 'fs_no_themes_dir', $this->strings['fs_no_themes_dir'], array( 'status' => 500 ) );
                                         break;
                                 default:
                                         if ( ! $wp_filesystem->find_folder($dir) )
-                                                return new WP_Error( 'fs_no_folder', sprintf( $this->strings['fs_no_folder'], esc_html( basename( $dir ) ) ) );
+                                                return new WP_Error( 'fs_no_folder', sprintf( $this->strings['fs_no_folder'], esc_html( basename( $dir ) ) ), array( 'status' => 500 ) );
                                         break;
                         }
                 }
@@ -241 +241 @@
                         return $package; //must be a local file..
 
                 if ( empty($package) )
-                        return new WP_Error('no_package', $this->strings['no_package']);
+                        return new WP_Error( 'no_package', $this->strings['no_package'], array( 'status' => 404 ) );
 
                 $this->skin->feedback('downloading_package', $package);
 
@@ -248 +248 @@
                 $download_file = download_url($package);
 
                 if ( is_wp_error($download_file) )
-                        return new WP_Error('download_failed', $this->strings['download_failed'], $download_file->get_error_message());
+                        return new WP_Error( 'download_failed', $this->strings['download_failed'], array( 'status' => 500, 'error' => $download_file->get_error_message() ) );
 
                 return $download_file;
         }
@@ -297 +297 @@
                 if ( is_wp_error($result) ) {
                         $wp_filesystem->delete($working_dir, true);
                         if ( 'incompatible_archive' == $result->get_error_code() ) {
-                                return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], $result->get_error_data() );
+                                return new WP_Error( 'incompatible_archive', $this->strings['incompatible_archive'], array( 'status' => 500, 'error' => $result->get_error_data() ) );
                         }
                         return $result;
                 }
@@ -355 +355 @@
                 }
 
                 if ( ! empty( $unwritable_files ) ) {
-                        return new WP_Error( 'files_not_writable', $this->strings['files_not_writable'], implode( ', ', $unwritable_files ) );
+                        return new WP_Error( 'files_not_writable', $this->strings['files_not_writable'], array( 'status' => 500, 'error' => implode( ', ', $unwritable_files ) ) );
                 }
 
                 if ( ! $wp_filesystem->delete( $remote_destination, true ) ) {
-                        return new WP_Error( 'remove_old_failed', $this->strings['remove_old_failed'] );
+                        return new WP_Error( 'remove_old_failed', $this->strings['remove_old_failed'], array( 'status' => 500 ) );
                 }
 
                 return true;
@@ -418 +418 @@
                 @set_time_limit( 300 );
 
                 if ( empty( $source ) || empty( $destination ) ) {
-                        return new WP_Error( 'bad_request', $this->strings['bad_request'] );
+                        return new WP_Error( 'bad_request', $this->strings['bad_request'], array( 'status' => 400 ) );
                 }
                 $this->skin->feedback( 'installing_package' );
 
@@ -451 +451 @@
                 if ( 1 == count( $source_files ) && $wp_filesystem->is_dir( trailingslashit( $args['source'] ) . $source_files[0] . '/' ) ) { //Only one folder? Then we want its contents.
                         $source = trailingslashit( $args['source'] ) . trailingslashit( $source_files[0] );
                 } elseif ( count( $source_files ) == 0 ) {
-                        return new WP_Error( 'incompatible_archive_empty', $this->strings['incompatible_archive'], $this->strings['no_files'] ); // There are no files?
+                        return new WP_Error( 'incompatible_archive_empty', $this->strings['incompatible_archive'], array( 'status' => 500, 'error' => $this->strings['no_files'] ) ); // There are no files?
                 } else { // It's only a single file, the upgrader will use the folder name of this file as the destination folder. Folder name is based on zip filename.
                         $source = trailingslashit( $args['source'] );
                 }
@@ -523 +523 @@
                         $_files = $wp_filesystem->dirlist($remote_destination);
                         if ( ! empty($_files) ) {
                                 $wp_filesystem->delete($remote_source, true); //Clear out the source files.
-                                return new WP_Error('folder_exists', $this->strings['folder_exists'], $remote_destination );
+                                return new WP_Error( 'folder_exists', $this->strings['folder_exists'], array( 'status' => 500, 'error' => $remote_destination ) );
                         }
                 }
 
@@ -530 +530 @@
                 //Create destination if needed
                 if ( ! $wp_filesystem->exists( $remote_destination ) ) {
                         if ( ! $wp_filesystem->mkdir( $remote_destination, FS_CHMOD_DIR ) ) {
-                                return new WP_Error( 'mkdir_failed_destination', $this->strings['mkdir_failed'], $remote_destination );
+                                return new WP_Error( 'mkdir_failed_destination', $this->strings['mkdir_failed'], array( 'status' => 500, 'error' => $remote_destination ) );
                         }
                 }
                 // Copy new version of item into place.
@@ -1110 +1110 @@
                 }
 
                 if ( ! $plugins_found )
-                        return new WP_Error( 'incompatible_archive_no_plugins', $this->strings['incompatible_archive'], __( 'No valid plugins were found.' ) );
+                        return new WP_Error( 'incompatible_archive_no_plugins', $this->strings['incompatible_archive'], array( 'status' => 404, 'error' => __( 'No valid plugins were found.' ) ) );
 
                 return $source;
         }
@@ -1164 +1164 @@
 
                 $plugin = isset($plugin['plugin']) ? $plugin['plugin'] : '';
                 if ( empty($plugin) )
-                        return new WP_Error('bad_request', $this->strings['bad_request']);
+                        return new WP_Error( 'bad_request', $this->strings['bad_request'], array( 'status' => 400 ) );
 
                 if ( is_plugin_active($plugin) ) {
                         //Deactivate the plugin silently, Prevent deactivation hooks from running.
@@ -1199 +1199 @@
 
                 $plugin = isset($plugin['plugin']) ? $plugin['plugin'] : '';
                 if ( empty($plugin) )
-                        return new WP_Error('bad_request', $this->strings['bad_request']);
+                        return new WP_Error( 'bad_request', $this->strings['bad_request'], array( 'status' => 400 ) );
 
                 $plugins_dir = $wp_filesystem->wp_plugins_dir();
                 $this_plugin_dir = trailingslashit( dirname($plugins_dir . $plugin) );
@@ -1214 +1214 @@
                         $deleted = $wp_filesystem->delete($plugins_dir . $plugin);
 
                 if ( ! $deleted )
-                        return new WP_Error('remove_old_failed', $this->strings['remove_old_failed']);
+                        return new WP_Error( 'remove_old_failed', $this->strings['remove_old_failed'], array( 'status' => 500 ) );
 
                 return true;
         }
@@ -1653 +1653 @@
                 // A proper archive should have a style.css file in the single subdirectory
                 if ( ! file_exists( $working_directory . 'style.css' ) ) {
                         return new WP_Error( 'incompatible_archive_theme_no_style', $this->strings['incompatible_archive'],
-                                /* translators: %s: style.css */
-                                sprintf( __( 'The theme is missing the %s stylesheet.' ),
-                                        '<code>style.css</code>'
+                                array(
+                                        /* translators: %s: style.css */
+                                        'error' => sprintf( __( 'The theme is missing the %s stylesheet.' ),
+                                                '<code>style.css</code>'
+                                        ),
+                                        'status' => 500,
                                 )
                         );
                 }
@@ -1664 +1667 @@
 
                 if ( empty( $info['Name'] ) ) {
                         return new WP_Error( 'incompatible_archive_theme_no_name', $this->strings['incompatible_archive'],
-                                /* translators: %s: style.css */
-                                sprintf( __( 'The %s stylesheet doesn&#8217;t contain a valid theme header.' ),
-                                        '<code>style.css</code>'
+                                array(
+                                        /* translators: %s: style.css */
+                                        'error' => sprintf( __( 'The %s stylesheet doesn&#8217;t contain a valid theme header.' ),
+                                                '<code>style.css</code>'
+                                        ),
+                                        'status' => 500,
                                 )
                         );
                 }
@@ -1674 +1680 @@
                 // If it's not a child theme, it must have at least an index.php to be legit.
                 if ( empty( $info['Template'] ) && ! file_exists( $working_directory . 'index.php' ) ) {
                         return new WP_Error( 'incompatible_archive_theme_no_index', $this->strings['incompatible_archive'],
-                                /* translators: %s: index.php */
-                                sprintf( __( 'The theme is missing the %s file.' ),
-                                        '<code>index.php</code>'
+                                array(
+                                        /* translators: %s: index.php */
+                                        'error' => sprintf( __( 'The theme is missing the %s file.' ),
+                                                '<code>index.php</code>'
+                                        ),
+                                        'status' => 500,
                                 )
                         );
                 }
@@ -2022 +2031 @@
                 $remote_destination = $wp_filesystem->find_folder( WP_LANG_DIR );
                 if ( ! $wp_filesystem->exists( $remote_destination ) )
                         if ( ! $wp_filesystem->mkdir( $remote_destination, FS_CHMOD_DIR ) )
-                                return new WP_Error( 'mkdir_failed_lang_dir', $this->strings['mkdir_failed'], $remote_destination );
+                                return new WP_Error( 'mkdir_failed_lang_dir', $this->strings['mkdir_failed'], array( 'status' => 500, 'error' => $remote_destination ) );
 
                 foreach ( $language_updates as $language_update ) {
 
@@ -2106 +2115 @@
 
                 if ( ! $mo || ! $po ) {
                         return new WP_Error( 'incompatible_archive_pomo', $this->strings['incompatible_archive'],
-                                /* translators: 1: .po 2: .mo */
-                                sprintf( __( 'The language pack is missing either the %1$s or %2$s files.' ),
-                                        '<code>.po</code>',
-                                        '<code>.mo</code>'
+                                array(
+                                        /* translators: 1: .po 2: .mo */
+                                        'error' => sprintf( __( 'The language pack is missing either the %1$s or %2$s files.' ),
+                                                '<code>.po</code>',
+                                                '<code>.mo</code>'
+                                        ),
+                                        'status' => 500,
                                 )
                         );
                 }
@@ -2219 +2231 @@
 
                 // Is an update available?
                 if ( !isset( $current->response ) || $current->response == 'latest' )
-                        return new WP_Error('up_to_date', $this->strings['up_to_date']);
+                        return new WP_Error( 'up_to_date', $this->strings['up_to_date'], array( 'status' => 400 ) );
 
                 $res = $this->fs_connect( array( ABSPATH, WP_CONTENT_DIR ), $parsed_args['allow_relaxed_file_ownership'] );
                 if ( ! $res || is_wp_error( $res ) ) {
@@ -2263 +2275 @@
                 // Copy update-core.php from the new version into place.
                 if ( !$wp_filesystem->copy($working_dir . '/wordpress/wp-admin/includes/update-core.php', $wp_dir . 'wp-admin/includes/update-core.php', true) ) {
                         $wp_filesystem->delete($working_dir, true);
-                        return new WP_Error( 'copy_failed_for_update_core_file', __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), 'wp-admin/includes/update-core.php' );
+                        return new WP_Error( 'copy_failed_for_update_core_file', __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), array( 'status' => 500, 'error' => 'wp-admin/includes/update-core.php' ) );
                 }
                 $wp_filesystem->chmod($wp_dir . 'wp-admin/includes/update-core.php', FS_CHMOD_FILE);
 
@@ -2270 +2282 @@
                 require_once( ABSPATH . 'wp-admin/includes/update-core.php' );
 
                 if ( ! function_exists( 'update_core' ) )
-                        return new WP_Error( 'copy_failed_space', $this->strings['copy_failed_space'] );
+                        return new WP_Error( 'copy_failed_space', $this->strings['copy_failed_space'], array( 'status' => 500 ) );
 
                 $result = update_core( $working_dir, $wp_dir );
 

src/wp-admin/includes/file.php

@@ -479 +479 @@
 function download_url( $url, $timeout = 300 ) {
         //WARNING: The file is not automatically deleted, The script must unlink() the file.
         if ( ! $url )
-                return new WP_Error('http_no_url', __('Invalid URL Provided.'));
+                return new WP_Error( 'http_no_url', __('Invalid URL Provided.'), array( 'status' => 500 ) );
 
         $tmpfname = wp_tempnam($url);
         if ( ! $tmpfname )
-                return new WP_Error('http_no_file', __('Could not create Temporary file.'));
+                return new WP_Error( 'http_no_file', __('Could not create Temporary file.'), array( 'status' => 500 ) );
 
         $response = wp_safe_remote_get( $url, array( 'timeout' => $timeout, 'stream' => true, 'filename' => $tmpfname ) );
 
@@ -494 +494 @@
 
         if ( 200 != wp_remote_retrieve_response_code( $response ) ){
                 unlink( $tmpfname );
-                return new WP_Error( 'http_404', trim( wp_remote_retrieve_response_message( $response ) ) );
+                return new WP_Error( 'http_404', trim( wp_remote_retrieve_response_message( $response ) ), array( 'status' => 404 ) );
         }
 
         $content_md5 = wp_remote_retrieve_header( $response, 'content-md5' );
@@ -531 +531 @@
         if ( $file_md5 === $expected_raw_md5 )
                 return true;
 
-        return new WP_Error( 'md5_mismatch', sprintf( __( 'The checksum of the file (%1$s) does not match the expected checksum value (%2$s).' ), bin2hex( $file_md5 ), bin2hex( $expected_raw_md5 ) ) );
+        return new WP_Error( 'md5_mismatch', sprintf( __( 'The checksum of the file (%1$s) does not match the expected checksum value (%2$s).' ), array( 'status' => 500, 'error' => bin2hex( $file_md5 ), bin2hex( $expected_raw_md5 ) ) ) );
 }
 
 /**
@@ -553 +553 @@
         global $wp_filesystem;
 
         if ( ! $wp_filesystem || !is_object($wp_filesystem) )
-                return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
+                return new WP_Error( 'fs_unavailable', __('Could not access filesystem.'), array( 'status' => 500 ) );
 
         // Unzip can use a lot of memory, but not this much hopefully
         /** This filter is documented in wp-admin/admin.php */
@@ -622 +622 @@
 
         $zopen = $z->open( $file, ZIPARCHIVE::CHECKCONS );
         if ( true !== $zopen )
-                return new WP_Error( 'incompatible_archive', __( 'Incompatible Archive.' ), array( 'ziparchive_error' => $zopen ) );
+                return new WP_Error( 'incompatible_archive', __( 'Incompatible Archive.' ), array( 'status' => 500, 'ziparchive_error' => $zopen ) );
 
         $uncompressed_size = 0;
 
         for ( $i = 0; $i < $z->numFiles; $i++ ) {
                 if ( ! $info = $z->statIndex($i) )
-                        return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
+                        return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ), array( 'status' => 500 ) );
 
                 if ( '__MACOSX/' === substr($info['name'], 0, 9) ) // Skip the OS X-created __MACOSX directory
                         continue;
@@ -649 +649 @@
         if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
                 $available_space = @disk_free_space( WP_CONTENT_DIR );
                 if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space )
-                        return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), compact( 'uncompressed_size', 'available_space' ) );
+                        return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), array( 'status' => 507, 'error' => compact( 'uncompressed_size', 'available_space' ) ) );
         }
 
         $needed_dirs = array_unique($needed_dirs);
@@ -672 +672 @@
         foreach ( $needed_dirs as $_dir ) {
                 // Only check to see if the Dir exists upon creation failure. Less I/O this way.
                 if ( ! $wp_filesystem->mkdir( $_dir, FS_CHMOD_DIR ) && ! $wp_filesystem->is_dir( $_dir ) ) {
-                        return new WP_Error( 'mkdir_failed_ziparchive', __( 'Could not create directory.' ), substr( $_dir, strlen( $to ) ) );
+                        return new WP_Error( 'mkdir_failed_ziparchive', __( 'Could not create directory.' ), array( 'status' => 500, 'error' => substr( $_dir, strlen( $to ) ) ) );
                 }
         }
         unset($needed_dirs);
@@ -679 +679 @@
 
         for ( $i = 0; $i < $z->numFiles; $i++ ) {
                 if ( ! $info = $z->statIndex($i) )
-                        return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ) );
+                        return new WP_Error( 'stat_failed_ziparchive', __( 'Could not retrieve file from archive.' ), array( 'status' => 500 ) );
 
                 if ( '/' == substr($info['name'], -1) ) // directory
                         continue;
@@ -689 +689 @@
 
                 $contents = $z->getFromIndex($i);
                 if ( false === $contents )
-                        return new WP_Error( 'extract_failed_ziparchive', __( 'Could not extract file from archive.' ), $info['name'] );
+                        return new WP_Error( 'extract_failed_ziparchive', __( 'Could not extract file from archive.' ), $info['name'], array( 'status' => 500 ) );
 
                 if ( ! $wp_filesystem->put_contents( $to . $info['name'], $contents, FS_CHMOD_FILE) )
-                        return new WP_Error( 'copy_failed_ziparchive', __( 'Could not copy file.' ), $info['name'] );
+                        return new WP_Error( 'copy_failed_ziparchive', __( 'Could not copy file.' ), $info['name'], array( 'status' => 500 ) );
         }
 
         $z->close();
@@ -730 +730 @@
 
         // Is the archive valid?
         if ( !is_array($archive_files) )
-                return new WP_Error('incompatible_archive', __('Incompatible Archive.'), $archive->errorInfo(true));
+                return new WP_Error( 'incompatible_archive', __('Incompatible Archive.'), array( 'status' => 500, 'error' => $archive->errorInfo(true) ) );
 
         if ( 0 == count($archive_files) )
-                return new WP_Error( 'empty_archive_pclzip', __( 'Empty archive.' ) );
+                return new WP_Error( 'empty_archive_pclzip', __( 'Empty archive.' ), array( 'status' => 500 ) );
 
         $uncompressed_size = 0;
 
@@ -755 +755 @@
         if ( defined( 'DOING_CRON' ) && DOING_CRON ) {
                 $available_space = @disk_free_space( WP_CONTENT_DIR );
                 if ( $available_space && ( $uncompressed_size * 2.1 ) > $available_space )
-                        return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), compact( 'uncompressed_size', 'available_space' ) );
+                        return new WP_Error( 'disk_full_unzip_file', __( 'Could not copy files. You may have run out of disk space.' ), array( 'status' => 500, 'error' => compact( 'uncompressed_size', 'available_space' ) ) );
         }
 
         $needed_dirs = array_unique($needed_dirs);
@@ -778 +778 @@
         foreach ( $needed_dirs as $_dir ) {
                 // Only check to see if the dir exists upon creation failure. Less I/O this way.
                 if ( ! $wp_filesystem->mkdir( $_dir, FS_CHMOD_DIR ) && ! $wp_filesystem->is_dir( $_dir ) )
-                        return new WP_Error( 'mkdir_failed_pclzip', __( 'Could not create directory.' ), substr( $_dir, strlen( $to ) ) );
+                        return new WP_Error( 'mkdir_failed_pclzip', __( 'Could not create directory.' ), array( 'status' => 500, 'error' => substr( $_dir, strlen( $to ) ) ) );
         }
         unset($needed_dirs);
 
@@ -791 +791 @@
                         continue;
 
                 if ( ! $wp_filesystem->put_contents( $to . $file['filename'], $file['content'], FS_CHMOD_FILE) )
-                        return new WP_Error( 'copy_failed_pclzip', __( 'Could not copy file.' ), $file['filename'] );
+                        return new WP_Error( 'copy_failed_pclzip', __( 'Could not copy file.' ), $file['filename'], array( 'status' => 500 ) );
         }
         return true;
 }
@@ -826 +826 @@
                                 // If copy failed, chmod file to 0644 and try again.
                                 $wp_filesystem->chmod( $to . $filename, FS_CHMOD_FILE );
                                 if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) )
-                                        return new WP_Error( 'copy_failed_copy_dir', __( 'Could not copy file.' ), $to . $filename );
+                                        return new WP_Error( 'copy_failed_copy_dir', __( 'Could not copy file.' ), array( 'status' => 500, 'error' => $to . $filename ) );
                         }
                 } elseif ( 'd' == $fileinfo['type'] ) {
                         if ( !$wp_filesystem->is_dir($to . $filename) ) {
                                 if ( !$wp_filesystem->mkdir($to . $filename, FS_CHMOD_DIR) )
-                                        return new WP_Error( 'mkdir_failed_copy_dir', __( 'Could not create directory.' ), $to . $filename );
+                                        return new WP_Error( 'mkdir_failed_copy_dir', __( 'Could not create directory.' ), array( 'status' => 500, 'error' => $to . $filename ) );
                         }
 
                         // generate the $sub_skip_list for the subdirectory as a sub-set of the existing $skip_list

src/wp-admin/includes/media.php

@@ -278 +278 @@
         $file = wp_handle_upload($_FILES[$file_id], $overrides, $time);
 
         if ( isset($file['error']) )
-                return new WP_Error( 'upload_error', $file['error'] );
+                return new WP_Error( 'upload_error', $file['error'], array( 'status' => 500 ) );
 
         $name_parts = pathinfo($name);
         $name = trim( substr( $name, 0, -(1 + strlen($name_parts['extension'])) ) );
@@ -397 +397 @@
 
         $file = wp_handle_sideload( $file_array, $overrides, $time );
         if ( isset($file['error']) )
-                return new WP_Error( 'upload_error', $file['error'] );
+                return new WP_Error( 'upload_error', $file['error'], array( 'status' => 500 ) );
 
         $url = $file['url'];
         $type = $file['type'];
@@ -851 +851 @@
                 // Set variables for storage, fix file filename for query strings.
                 preg_match( '/[^\?]+\.(jpe?g|jpe|gif|png)\b/i', $file, $matches );
                 if ( ! $matches ) {
-                        return new WP_Error( 'image_sideload_failed', __( 'Invalid image URL' ) );
+                        return new WP_Error( 'image_sideload_failed', __( 'Invalid image URL' ), array( 'status' => 404 ) );
                 }
 
                 $file_array = array();
@@ -887 +887 @@
                 $html = "<img src='$src' alt='$alt' />";
                 return $html;
         } else {
-                return new WP_Error( 'image_sideload_failed' );
+                return new WP_Error( 'image_sideload_failed', null, array( 'status' => 500 ) );
         }
 }
 

src/wp-admin/includes/nav-menu.php

@@ -906 +906 @@
                                 /* translators: %s: walker class name */
                                 sprintf( __( 'The Walker class named %s does not exist.' ),
                                         '<strong>' . $walker_class_name . '</strong>'
-                                )
+                                ),
+                                array( 'status' => 500 )
                         );
                 }
 

src/wp-admin/includes/plugin.php

@@ -601 +601 @@
 
                 if ( ob_get_length() > 0 ) {
                         $output = ob_get_clean();
-                        return new WP_Error('unexpected_output', __('The plugin generated unexpected output.'), $output);
+                        return new WP_Error( 'unexpected_output', __('The plugin generated unexpected output.'), array( 'status' => 500, 'error' => $output ) );
                 }
                 ob_end_clean();
         }
@@ -738 +738 @@
         }
 
         if ( !empty($errors) )
-                return new WP_Error('plugins_invalid', __('One of the plugins is invalid.'), $errors);
+                return new WP_Error( 'plugins_invalid', __('One of the plugins is invalid.'), array( 'status' => 500, 'error' => $errors ) );
 
         return true;
 }
@@ -793 +793 @@
         }
 
         if ( ! is_object($wp_filesystem) )
-                return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
+                return new WP_Error( 'fs_unavailable', __('Could not access filesystem.'), array( 'status' => 500 ) );
 
         if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
-                return new WP_Error('fs_error', __('Filesystem error.'), $wp_filesystem->errors);
+                return new WP_Error( 'fs_error', __('Filesystem error.'), array( 'status' => 500, 'error' => $wp_filesystem->errors ) );
 
         // Get the base plugin folder.
         $plugins_dir = $wp_filesystem->wp_plugins_dir();
         if ( empty( $plugins_dir ) ) {
-                return new WP_Error( 'fs_no_plugins_dir', __( 'Unable to locate WordPress Plugin directory.' ) );
+                return new WP_Error( 'fs_no_plugins_dir', __( 'Unable to locate WordPress Plugin directory.' ), array( 'status' => 404 ) );
         }
 
         $plugins_dir = trailingslashit( $plugins_dir );
@@ -874 +874 @@
         }
 
         if ( ! empty($errors) )
-                return new WP_Error('could_not_remove_plugin', sprintf(__('Could not fully remove the plugin(s) %s.'), implode(', ', $errors)) );
+                return new WP_Error( 'could_not_remove_plugin', sprintf( __( 'Could not fully remove the plugin(s) %s.' ), implode( ', ', $errors ) ), array( 'status' => 500 ) );
 
         return true;
 }
@@ -929 +929 @@
  */
 function validate_plugin($plugin) {
         if ( validate_file($plugin) )
-                return new WP_Error('plugin_invalid', __('Invalid plugin path.'));
+                return new WP_Error( 'plugin_invalid', __( 'Invalid plugin path.' ), array( 'status' => 500 ) );
         if ( ! file_exists(WP_PLUGIN_DIR . '/' . $plugin) )
-                return new WP_Error('plugin_not_found', __('Plugin file does not exist.'));
+                return new WP_Error( 'plugin_not_found', __( 'Plugin file does not exist.' ), array( 'status' => 500 ) );
 
         $installed_plugins = get_plugins();
         if ( ! isset($installed_plugins[$plugin]) )
-                return new WP_Error('no_plugin_header', __('The plugin does not have a valid header.'));
+                return new WP_Error( 'no_plugin_header', __( 'The plugin does not have a valid header.' ), array( 'status' => 500 ) );
         return 0;
 }
 

src/wp-admin/includes/post.php

@@ -30 +30 @@
 
         if ( $update && ! current_user_can( 'edit_post', $post_data['ID'] ) ) {
                 if ( 'page' == $post_data['post_type'] )
-                        return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ) );
+                        return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ), array( 'status' => 403 ) );
                 else
-                        return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) );
+                        return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ), array( 'status' => 403 ) );
         } elseif ( ! $update && ! current_user_can( $ptype->cap->create_posts ) ) {
                 if ( 'page' == $post_data['post_type'] )
-                        return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
+                        return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ), array( 'status' => 403 ) );
                 else
-                        return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );
+                        return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ), array( 'status' => 403 ) );
         }
 
         if ( isset( $post_data['content'] ) )
@@ -68 +68 @@
                  && ! current_user_can( $ptype->cap->edit_others_posts ) ) {
                 if ( $update ) {
                         if ( 'page' == $post_data['post_type'] )
-                                return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ) );
+                                return new WP_Error( 'edit_others_pages', __( 'You are not allowed to edit pages as this user.' ), array( 'status' => 403 ) );
                         else
-                                return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ) );
+                                return new WP_Error( 'edit_others_posts', __( 'You are not allowed to edit posts as this user.' ), array( 'status' => 403 ) );
                 } else {
                         if ( 'page' == $post_data['post_type'] )
-                                return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ) );
+                                return new WP_Error( 'edit_others_pages', __( 'You are not allowed to create pages as this user.' ), array( 'status' => 403 ) );
                         else
-                                return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ) );
+                                return new WP_Error( 'edit_others_posts', __( 'You are not allowed to create posts as this user.' ), array( 'status' => 403 ) );
                 }
         }
 
@@ -160 +160 @@
                 $post_data['post_date'] = sprintf( "%04d-%02d-%02d %02d:%02d:%02d", $aa, $mm, $jj, $hh, $mn, $ss );
                 $valid_date = wp_checkdate( $mm, $jj, $aa, $post_data['post_date'] );
                 if ( !$valid_date ) {
-                        return new WP_Error( 'invalid_date', __( 'Whoops, the provided date is invalid.' ) );
+                        return new WP_Error( 'invalid_date', __( 'Whoops, the provided date is invalid.' ), array( 'status' => 500 ) );
                 }
                 $post_data['post_date_gmt'] = get_gmt_from_date( $post_data['post_date'] );
         }
@@ -714 +714 @@
 
         if ( !current_user_can( $ptype->cap->edit_posts ) ) {
                 if ( 'page' == $ptype->name )
-                        return new WP_Error( 'edit_pages', __( 'You are not allowed to create pages on this site.' ) );
+                        return new WP_Error( 'edit_pages', __( 'You are not allowed to create pages on this site.' ), array( 'status' => 403 ) );
                 else
-                        return new WP_Error( 'edit_posts', __( 'You are not allowed to create posts or drafts on this site.' ) );
+                        return new WP_Error( 'edit_posts', __( 'You are not allowed to create posts or drafts on this site.' ), array( 'status' => 403 ) );
         }
 
         $_POST['post_mime_type'] = '';
@@ -1768 +1768 @@
         $post_data['ID'] = $post_data['post_ID'] = $post_id;
 
         if ( false === wp_verify_nonce( $post_data['_wpnonce'], 'update-post_' . $post_id ) ) {
-                return new WP_Error( 'invalid_nonce', __( 'Error while saving.' ) );
+                return new WP_Error( 'invalid_nonce', __( 'Error while saving.' ), array( 'status' => 403 ) );
         }
 
         $post = get_post( $post_id );
 
         if ( ! current_user_can( 'edit_post', $post->ID ) ) {
-                return new WP_Error( 'edit_posts', __( 'You are not allowed to edit this item.' ) );
+                return new WP_Error( 'edit_posts', __( 'You are not allowed to edit this item.' ), array( 'status' => 403 ) );
         }
 
         if ( 'auto-draft' == $post->post_status )

src/wp-admin/includes/schema.php

@@ -1103 +1103 @@
 
                         $msg .= '<p>' . __( 'You can still use your site but any subdomain you create may not be accessible. If you know your DNS is correct, ignore this message.' ) . '</p>';
 
-                        return new WP_Error( 'no_wildcard_dns', $msg );
+                        return new WP_Error( 'no_wildcard_dns', $msg, array( 'status' => 500 ) );
                 }
         }
 

src/wp-admin/includes/taxonomy.php

@@ -113 +113 @@
                 if ( ! $wp_error ) {
                         return 0;
                 } else {
-                        return new WP_Error( 'cat_name', __( 'You did not enter a category name.' ) );
+                        return new WP_Error( 'cat_name', __( 'You did not enter a category name.' ), array( 'status' => 500 ) );
                 }
         }
 

src/wp-admin/includes/theme.php

@@ -52 +52 @@
         }
 
         if ( ! is_object($wp_filesystem) )
-                return new WP_Error('fs_unavailable', __('Could not access filesystem.'));
+                return new WP_Error( 'fs_unavailable', __( 'Could not access filesystem.' ), array( 'status' => 500 ) );
 
         if ( is_wp_error($wp_filesystem->errors) && $wp_filesystem->errors->get_error_code() )
-                return new WP_Error('fs_error', __('Filesystem error.'), $wp_filesystem->errors);
+                return new WP_Error( 'fs_error', __( 'Filesystem error.' ), array( 'status' => 500, 'error' => $wp_filesystem->errors ) );
 
         // Get the base plugin folder.
         $themes_dir = $wp_filesystem->wp_themes_dir();
         if ( empty( $themes_dir ) ) {
-                return new WP_Error( 'fs_no_themes_dir', __( 'Unable to locate WordPress theme directory.' ) );
+                return new WP_Error( 'fs_no_themes_dir', __( 'Unable to locate WordPress theme directory.' ), array( 'status' => 500 ) );
         }
 
         $themes_dir = trailingslashit( $themes_dir );
@@ -68 +68 @@
         $deleted = $wp_filesystem->delete( $theme_dir, true );
 
         if ( ! $deleted ) {
-                return new WP_Error( 'could_not_remove_theme', sprintf( __( 'Could not fully remove the theme %s.' ), $stylesheet ) );
+                return new WP_Error( 'could_not_remove_theme', sprintf( __( 'Could not fully remove the theme %s.' ), $stylesheet ), array( 'status' => 500 ) );
         }
 
         $theme_translations = wp_get_installed_translations( 'themes' );

src/wp-admin/includes/update-core.php

@@ -831 +831 @@
         }
         if ( ! $distro ) {
                 $wp_filesystem->delete( $from, true );
-                return new WP_Error( 'insane_distro', __('The update could not be unpacked') );
+                return new WP_Error( 'insane_distro', __('The update could not be unpacked'), array( 'status' => 500 ) );
         }
 
 
@@ -848 +848 @@
         $versions_file = trailingslashit( $wp_filesystem->wp_content_dir() ) . 'upgrade/version-current.php';
         if ( ! $wp_filesystem->copy( $from . $distro . 'wp-includes/version.php', $versions_file ) ) {
                 $wp_filesystem->delete( $from, true );
-                return new WP_Error( 'copy_failed_for_version_file', __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), 'wp-includes/version.php' );
+                return new WP_Error( 'copy_failed_for_version_file', __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), array( 'status' => 500, 'error' => 'wp-includes/version.php' ) );
         }
 
         $wp_filesystem->chmod( $versions_file, FS_CHMOD_FILE );
@@ -869 +869 @@
                 $wp_filesystem->delete($from, true);
 
         if ( !$mysql_compat && !$php_compat )
-                return new WP_Error( 'php_mysql_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version ) );
+                return new WP_Error( 'php_mysql_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher and MySQL version %3$s or higher. You are running PHP version %4$s and MySQL version %5$s.'), $wp_version, $required_php_version, $required_mysql_version, $php_version, $mysql_version ), array( 'status' => 500 ) );
         elseif ( !$php_compat )
-                return new WP_Error( 'php_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version ) );
+                return new WP_Error( 'php_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires PHP version %2$s or higher. You are running version %3$s.'), $wp_version, $required_php_version, $php_version ), array( 'status' => 500 ) );
         elseif ( !$mysql_compat )
-                return new WP_Error( 'mysql_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version ) );
+                return new WP_Error( 'mysql_not_compatible', sprintf( __('The update cannot be installed because WordPress %1$s requires MySQL version %2$s or higher. You are running version %3$s.'), $wp_version, $required_mysql_version, $mysql_version ), array( 'status' => 500 ) );
 
         /** This filter is documented in wp-admin/includes/update-core.php */
         apply_filters( 'update_feedback', __( 'Preparing to install the latest version…' ) );
@@ -923 +923 @@
                         $error_data = version_compare( $old_wp_version, '3.7-beta2', '>' ) ? array_keys( $files_not_writable ) : '';
 
                         if ( $files_not_writable )
-                                return new WP_Error( 'files_not_writable', __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), implode( ', ', $error_data ) );
+                                return new WP_Error( 'files_not_writable', __( 'The update cannot be installed because we will be unable to copy some files. This is usually due to inconsistent file permissions.' ), array( 'status' => 500, 'error' => implode( ', ', $error_data ) ) );
                 }
         }
 
@@ -1159 +1159 @@
                                 // If copy failed, chmod file to 0644 and try again.
                                 $wp_filesystem->chmod( $to . $filename, FS_CHMOD_FILE );
                                 if ( ! $wp_filesystem->copy($from . $filename, $to . $filename, true, FS_CHMOD_FILE) )
-                                        return new WP_Error( 'copy_failed__copy_dir', __( 'Could not copy file.' ), $to . $filename );
+                                        return new WP_Error( 'copy_failed__copy_dir', __( 'Could not copy file.' ), array( 'status' => 500, 'error' => $to . $filename ) );
                         }
                 } elseif ( 'd' == $fileinfo['type'] ) {
                         if ( !$wp_filesystem->is_dir($to . $filename) ) {
                                 if ( !$wp_filesystem->mkdir($to . $filename, FS_CHMOD_DIR) )
-                                        return new WP_Error( 'mkdir_failed__copy_dir', __( 'Could not create directory.' ), $to . $filename );
+                                        return new WP_Error( 'mkdir_failed__copy_dir', __( 'Could not create directory.' ), array( 'status' => 500, 'error' => $to . $filename ) );
                         }
 
                         /*