From ddc8ddb294dbf5eb31d8310cbc8191f54785aa38 Mon Sep 17 00:00:00 2001
From: Sergey Biryukov <sergeybiryukov.ru@gmail.com>
Date: Mon, 10 Feb 2020 02:12:06 +0000
Subject: [PATCH] Import: Remove "Blogroll" import option (for links in OPML
 format) from the list of popular importer plugins.

Link Manager is disabled for new installations since WordPress 3.5, so core should not encourage importing links.

See #meta4706 for the corresponding WordPress.org API change.

Props Ipstenu, hareesh-pillai, DrewAPicture, nacin, karmatosed, dd32, garrett-eclipse.
Fixes #22994. See #21307.
Built from https://develop.svn.wordpress.org/trunk@47227


git-svn-id: http://core.svn.wordpress.org/trunk@47027 1a063a9b-81f0-0310-95a4-ce76da25c4cd
---
 wp-admin/includes/import.php | 6 ------
 wp-includes/version.php      | 2 +-
 2 files changed, 1 insertion(+), 7 deletions(-)

diff --git a/wp-admin/includes/import.php b/wp-admin/includes/import.php
index a91477db55..b21004321f 100644
--- a/wp-admin/includes/import.php
+++ b/wp-admin/includes/import.php
@@ -210,12 +210,6 @@ function wp_get_popular_importers() {
 			'plugin-slug' => 'movabletype-importer',
 			'importer-id' => 'mt',
 		),
-		'opml'        => array(
-			'name'        => __( 'Blogroll' ),
-			'description' => __( 'Import links in OPML format.' ),
-			'plugin-slug' => 'opml-importer',
-			'importer-id' => 'opml',
-		),
 		'rss'         => array(
 			'name'        => __( 'RSS' ),
 			'description' => __( 'Import posts from an RSS feed.' ),
diff --git a/wp-includes/version.php b/wp-includes/version.php
index e8b16a755a..be5e19fafd 100644
--- a/wp-includes/version.php
+++ b/wp-includes/version.php
@@ -13,7 +13,7 @@
  *
  * @global string $wp_version
  */
-$wp_version = '5.4-alpha-47226';
+$wp_version = '5.4-alpha-47227';
 
 /**
  * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.