<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[3690] sites/trunk/api.wordpress.org/public_html/core/importers/1.0/index.php: Importers API: Add support for a `version` parameter.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="http://meta.trac.wordpress.org/changeset/3690">3690</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"http://meta.trac.wordpress.org/changeset/3690","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>ocean90</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2016-07-16 15:42:29 +0000 (Sat, 16 Jul 2016)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Importers API: Add support for a `version` parameter.
#core35191 is going to change the layout of the Importer screen. It uses new strings to make the description consistent with the plugin state.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkapiwordpressorgpublic_htmlcoreimporters10indexphp">sites/trunk/api.wordpress.org/public_html/core/importers/1.0/index.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkapiwordpressorgpublic_htmlcoreimporters10indexphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/api.wordpress.org/public_html/core/importers/1.0/index.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/api.wordpress.org/public_html/core/importers/1.0/index.php 2016-07-15 19:20:10 UTC (rev 3689)
+++ sites/trunk/api.wordpress.org/public_html/core/importers/1.0/index.php 2016-07-16 15:42:29 UTC (rev 3690)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,15 +1,77 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$popular_importers = wporg_api_get_popular_importers();
-# unset( $popular_importers['tumblr'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$version = '';
+if ( isset( $_REQUEST['version'] ) ) { // Introduced in WordPress 4.6.
+ $version = str_replace( '-src', '', $_REQUEST['version'] );
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( version_compare( $version, '4.6-beta', '>=' ) ) {
+ $popular_importers = wporg_api_get_popular_importers_46();
+} else {
+ $popular_importers = wporg_api_get_popular_importers();
+}
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $response = array( 'importers' => $popular_importers, 'translated' => false );
</span><span class="cx" style="display: block; padding: 0 10px"> echo defined( 'JSON_RESPONSE' ) ? json_encode( $response ) : serialize( $response );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> function __( $string ) { return $string; }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-// This function is synced in wp-admin/includes/import.php.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// This function is synced in wp-admin/includes/import.php of >= 4.6
+function wporg_api_get_popular_importers_46() {
+ return array(
+ // slug => name, description, plugin slug, and register_importer() slug
+ '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' ),
+ 'description' => __( 'Convert existing categories to tags or tags to categories, selectively.' ),
+ 'plugin-slug' => 'wpcat2tag-importer',
+ 'importer-id' => 'wp-cat2tag',
+ ),
+ 'livejournal' => array(
+ 'name' => __( 'LiveJournal' ),
+ 'description' => __( 'Import posts from LiveJournal using their API.' ),
+ 'plugin-slug' => 'livejournal-importer',
+ 'importer-id' => 'livejournal',
+ ),
+ 'movabletype' => array(
+ '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' ),
+ 'description' => __( 'Import links in OPML format.' ),
+ 'plugin-slug' => 'opml-importer',
+ 'importer-id' => 'opml',
+ ),
+ 'rss' => array(
+ 'name' => __( 'RSS' ),
+ 'description' => __( 'Import posts from an RSS feed.' ),
+ 'plugin-slug' => 'rss-importer',
+ 'importer-id' => 'rss',
+ ),
+ 'tumblr' => array(
+ 'name' => __( 'Tumblr' ),
+ 'description' => __( 'Import posts & media from Tumblr using their API.' ),
+ 'plugin-slug' => 'tumblr-importer',
+ 'importer-id' => 'tumblr',
+ ),
+ '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',
+ ),
+ );
+}
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+// This function is synced in wp-admin/includes/import.php of <= 4.5
</ins><span class="cx" style="display: block; padding: 0 10px"> function wporg_api_get_popular_importers() {
</span><span class="cx" style="display: block; padding: 0 10px"> return array(
</span><span class="cx" style="display: block; padding: 0 10px"> // slug => name, description, plugin slug, and register_importer() slug
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -63,4 +125,3 @@
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-
</del></span></pre>
</div>
</div>
</body>
</html>