--- a/wp/wp-admin/includes/import.php Mon Oct 14 18:06:33 2019 +0200
+++ b/wp/wp-admin/includes/import.php Mon Oct 14 18:28:13 2019 +0200
@@ -53,9 +53,10 @@
*/
function register_importer( $id, $name, $description, $callback ) {
global $wp_importers;
- if ( is_wp_error( $callback ) )
+ if ( is_wp_error( $callback ) ) {
return $callback;
- $wp_importers[$id] = array ( $name, $description, $callback );
+ }
+ $wp_importers[ $id ] = array( $name, $description, $callback );
}
/**
@@ -81,13 +82,16 @@
function wp_import_handle_upload() {
if ( ! isset( $_FILES['import'] ) ) {
return array(
- 'error' => __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' )
+ 'error' => __( 'File is empty. Please upload something more substantial. This error could also be caused by uploads being disabled in your php.ini or by post_max_size being defined as smaller than upload_max_filesize in php.ini.' ),
);
}
- $overrides = array( 'test_form' => false, 'test_type' => false );
+ $overrides = array(
+ 'test_form' => false,
+ 'test_type' => false,
+ );
$_FILES['import']['name'] .= '.txt';
- $upload = wp_handle_upload( $_FILES['import'], $overrides );
+ $upload = wp_handle_upload( $_FILES['import'], $overrides );
if ( isset( $upload['error'] ) ) {
return $upload;
@@ -95,12 +99,12 @@
// Construct the object array
$object = array(
- 'post_title' => basename( $upload['file'] ),
- 'post_content' => $upload['url'],
+ 'post_title' => wp_basename( $upload['file'] ),
+ 'post_content' => $upload['url'],
'post_mime_type' => $upload['type'],
- 'guid' => $upload['url'],
- 'context' => 'import',
- 'post_status' => 'private'
+ 'guid' => $upload['url'],
+ 'context' => 'import',
+ 'post_status' => 'private',
);
// Save the data
@@ -112,7 +116,10 @@
*/
wp_schedule_single_event( time() + DAY_IN_SECONDS, 'importer_scheduled_cleanup', array( $id ) );
- return array( 'file' => $upload['file'], 'id' => $id );
+ return array(
+ 'file' => $upload['file'],
+ 'id' => $id,
+ );
}
/**
@@ -125,22 +132,25 @@
function wp_get_popular_importers() {
include( ABSPATH . WPINC . '/version.php' ); // include an unmodified $wp_version
- $locale = get_user_locale();
- $cache_key = 'popular_importers_' . md5( $locale . $wp_version );
+ $locale = get_user_locale();
+ $cache_key = 'popular_importers_' . md5( $locale . $wp_version );
$popular_importers = get_site_transient( $cache_key );
if ( ! $popular_importers ) {
- $url = add_query_arg( array(
- 'locale' => $locale,
- 'version' => $wp_version,
- ), 'http://api.wordpress.org/core/importers/1.1/' );
+ $url = add_query_arg(
+ array(
+ 'locale' => $locale,
+ 'version' => $wp_version,
+ ),
+ 'http://api.wordpress.org/core/importers/1.1/'
+ );
$options = array( 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ) );
if ( wp_http_supports( array( 'ssl' ) ) ) {
$url = set_url_scheme( $url, 'https' );
}
- $response = wp_remote_get( $url, $options );
+ $response = wp_remote_get( $url, $options );
$popular_importers = json_decode( wp_remote_retrieve_body( $response ), true );
if ( is_array( $popular_importers ) ) {
@@ -152,63 +162,67 @@
if ( is_array( $popular_importers ) ) {
// If the data was received as translated, return it as-is.
- if ( $popular_importers['translated'] )
+ if ( $popular_importers['translated'] ) {
return $popular_importers['importers'];
+ }
foreach ( $popular_importers['importers'] as &$importer ) {
+ // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
$importer['description'] = translate( $importer['description'] );
- if ( $importer['name'] != 'WordPress' )
+ if ( $importer['name'] != 'WordPress' ) {
+ // phpcs:ignore WordPress.WP.I18n.LowLevelTranslationFunction,WordPress.WP.I18n.NonSingularStringLiteralText
$importer['name'] = translate( $importer['name'] );
+ }
}
return $popular_importers['importers'];
}
return array(
// slug => name, description, plugin slug, and register_importer() slug
- 'blogger' => array(
- 'name' => __( 'Blogger' ),
+ 'blogger' => array(
+ 'name' => __( 'Blogger' ),
'description' => __( 'Import posts, comments, and users from a Blogger blog.' ),
'plugin-slug' => 'blogger-importer',
'importer-id' => 'blogger',
),
- 'wpcat2tag' => array(
- 'name' => __( 'Categories and Tags Converter' ),
+ 'wpcat2tag' => array(
+ 'name' => __( 'Categories and Tags Converter' ),
'description' => __( 'Convert existing categories to tags or tags to categories, selectively.' ),
'plugin-slug' => 'wpcat2tag-importer',
'importer-id' => 'wp-cat2tag',
),
'livejournal' => array(
- 'name' => __( 'LiveJournal' ),
+ 'name' => __( 'LiveJournal' ),
'description' => __( 'Import posts from LiveJournal using their API.' ),
'plugin-slug' => 'livejournal-importer',
'importer-id' => 'livejournal',
),
'movabletype' => array(
- 'name' => __( 'Movable Type and TypePad' ),
+ 'name' => __( 'Movable Type and TypePad' ),
'description' => __( 'Import posts and comments from a Movable Type or TypePad blog.' ),
'plugin-slug' => 'movabletype-importer',
'importer-id' => 'mt',
),
- 'opml' => array(
- 'name' => __( 'Blogroll' ),
+ 'opml' => array(
+ 'name' => __( 'Blogroll' ),
'description' => __( 'Import links in OPML format.' ),
'plugin-slug' => 'opml-importer',
'importer-id' => 'opml',
),
- 'rss' => array(
- 'name' => __( 'RSS' ),
+ 'rss' => array(
+ 'name' => __( 'RSS' ),
'description' => __( 'Import posts from an RSS feed.' ),
'plugin-slug' => 'rss-importer',
'importer-id' => 'rss',
),
- 'tumblr' => array(
- 'name' => __( 'Tumblr' ),
+ 'tumblr' => array(
+ 'name' => __( 'Tumblr' ),
'description' => __( 'Import posts & media from Tumblr using their API.' ),
'plugin-slug' => 'tumblr-importer',
'importer-id' => 'tumblr',
),
- 'wordpress' => array(
- 'name' => 'WordPress',
+ 'wordpress' => array(
+ 'name' => 'WordPress',
'description' => __( 'Import posts, pages, comments, custom fields, categories, and tags from a WordPress export file.' ),
'plugin-slug' => 'wordpress-importer',
'importer-id' => 'wordpress',