<!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>[42632] trunk/src: Themes: Use `api.wordpress.org/themes/info/1.2/` to query theme information.</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="https://core.trac.wordpress.org/changeset/42632">42632</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/42632","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>dd32</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2018-02-01 05:18:54 +0000 (Thu, 01 Feb 2018)</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'>Themes: Use `api.wordpress.org/themes/info/1.2/` to query theme information.
See <a href="https://core.trac.wordpress.org/ticket/43192">#43192</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesajaxactionsphp">trunk/src/wp-admin/includes/ajax-actions.php</a></li>
<li><a href="#trunksrcwpadminincludesthemephp">trunk/src/wp-admin/includes/theme.php</a></li>
<li><a href="#trunksrcwpadminjsthemejs">trunk/src/wp-admin/js/theme.js</a></li>
<li><a href="#trunksrcwpincludesclasswpcustomizemanagerphp">trunk/src/wp-includes/class-wp-customize-manager.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesajaxactionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/ajax-actions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/ajax-actions.php 2018-02-01 05:16:15 UTC (rev 42631)
+++ trunk/src/wp-admin/includes/ajax-actions.php 2018-02-01 05:18:54 UTC (rev 42632)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3218,7 +3218,7 @@
</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"> $theme->name = wp_kses( $theme->name, $themes_allowedtags );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $theme->author = wp_kses( $theme->author, $themes_allowedtags );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $theme->author = wp_kses( $theme->author['display_name'], $themes_allowedtags );
</ins><span class="cx" style="display: block; padding: 0 10px"> $theme->version = wp_kses( $theme->version, $themes_allowedtags );
</span><span class="cx" style="display: block; padding: 0 10px"> $theme->description = wp_kses( $theme->description, $themes_allowedtags );
</span><span class="cx" style="display: block; padding: 0 10px"> $theme->stars = wp_star_rating(
</span></span></pre></div>
<a id="trunksrcwpadminincludesthemephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/theme.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/theme.php 2018-02-01 05:16:15 UTC (rev 42631)
+++ trunk/src/wp-admin/includes/theme.php 2018-02-01 05:18:54 UTC (rev 42632)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -421,19 +421,27 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * for more information on the make-up of possible return objects depending on the value of `$action`.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function themes_api( $action, $args = array() ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // include an unmodified $wp_version
+ include( ABSPATH . WPINC . '/version.php' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_array( $args ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args = (object) $args;
</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">- if ( ! isset( $args->per_page ) ) {
- $args->per_page = 24;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( 'query_themes' == $action ) {
+ if ( ! isset( $args->per_page ) ) {
+ $args->per_page = 24;
+ }
</ins><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"> if ( ! isset( $args->locale ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $args->locale = get_user_locale();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ! isset( $args->wp_version ) ) {
+ $args->wp_version = substr( $wp_version, 0, 3 ); // X.y
+ }
+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters arguments used to query for installer pages from the WordPress.org Themes API.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -465,22 +473,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $res = apply_filters( 'themes_api', false, $action, $args );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! $res ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // include an unmodified $wp_version
- include( ABSPATH . WPINC . '/version.php' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $url = 'http://api.wordpress.org/themes/info/1.2/';
+ $url = add_query_arg(
+ array(
+ 'action' => $action,
+ 'request' => $args,
+ ),
+ $url
+ );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $url = $http_url = 'http://api.wordpress.org/themes/info/1.0/';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $http_url = $url;
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $ssl = wp_http_supports( array( 'ssl' ) ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $url = set_url_scheme( $url, 'https' );
</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"> $http_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'user-agent' => 'WordPress/' . $wp_version . '; ' . home_url( '/' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'body' => array(
- 'action' => $action,
- 'request' => serialize( $args ),
- ),
</del><span class="cx" style="display: block; padding: 0 10px"> );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $request = wp_remote_post( $url, $http_args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $request = wp_remote_get( $url, $http_args );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $ssl && is_wp_error( $request ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! wp_doing_ajax() ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -493,7 +503,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> headers_sent() || WP_DEBUG ? E_USER_WARNING : E_USER_NOTICE
</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">- $request = wp_remote_post( $http_url, $http_args );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $request = wp_remote_get( $http_url, $http_args );
</ins><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"> if ( is_wp_error( $request ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -507,8 +517,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $request->get_error_message()
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $res = maybe_unserialize( wp_remote_retrieve_body( $request ) );
- if ( ! is_object( $res ) && ! is_array( $res ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $res = json_decode( wp_remote_retrieve_body( $request ), true );
+ if ( is_array( $res ) ) {
+ // Object casting is required in order to match the info/1.0 format.
+ $res = (object) $res;
+ } elseif ( null === $res ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $res = new WP_Error(
</span><span class="cx" style="display: block; padding: 0 10px"> 'themes_api_failed',
</span><span class="cx" style="display: block; padding: 0 10px"> sprintf(
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -519,7 +532,22 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_remote_retrieve_body( $request )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( isset( $res->error ) ) {
+ $res = new WP_Error( 'themes_api_failed', $res->error );
+ }
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Back-compat for info/1.2 API, upgrade the theme objects in query_themes to objects.
+ if ( 'query_themes' == $action ) {
+ foreach ( $res->themes as $i => $theme ) {
+ $res->themes[ $i ] = (object) $theme;
+ }
+ }
+ // Back-compat for info/1.2 API, downgrade the feature_list result back to an array.
+ if ( 'feature_list' == $action ) {
+ $res = (array) $res;
+ }
</ins><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></span></pre></div>
<a id="trunksrcwpadminjsthemejs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/js/theme.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/js/theme.js 2018-02-01 05:16:15 UTC (rev 42631)
+++ trunk/src/wp-admin/js/theme.js 2018-02-01 05:18:54 UTC (rev 42632)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -334,18 +334,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> data: {
</span><span class="cx" style="display: block; padding: 0 10px"> // Request data
</span><span class="cx" style="display: block; padding: 0 10px"> request: _.extend({
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- per_page: 100,
- fields: {
- description: true,
- tested: true,
- requires: true,
- rating: true,
- downloaded: true,
- downloadLink: true,
- last_updated: true,
- homepage: true,
- num_ratings: true
- }
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ per_page: 100
</ins><span class="cx" style="display: block; padding: 0 10px"> }, request)
</span><span class="cx" style="display: block; padding: 0 10px"> },
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpcustomizemanagerphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-customize-manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-customize-manager.php 2018-02-01 05:16:15 UTC (rev 42631)
+++ trunk/src/wp-includes/class-wp-customize-manager.php 2018-02-01 05:18:54 UTC (rev 42632)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5619,19 +5619,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Arguments for all queries.
</span><span class="cx" style="display: block; padding: 0 10px"> $wporg_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'per_page' => 100,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'fields' => array(
- 'screenshot_url' => true,
- 'description' => true,
- 'rating' => true,
- 'downloaded' => true,
- 'downloadlink' => true,
- 'last_updated' => true,
- 'homepage' => true,
- 'num_ratings' => true,
- 'tags' => true,
- 'parent' => true,
- // 'extended_author' => true, @todo: WordPress.org throws a 500 server error when this is here.
- ),
</del><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"> $args = array_merge( $wporg_args, $args );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5674,10 +5661,8 @@
</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"> $theme->name = wp_kses( $theme->name, $themes_allowedtags );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $theme->author = wp_kses( $theme->author, $themes_allowedtags );
</del><span class="cx" style="display: block; padding: 0 10px"> $theme->version = wp_kses( $theme->version, $themes_allowedtags );
</span><span class="cx" style="display: block; padding: 0 10px"> $theme->description = wp_kses( $theme->description, $themes_allowedtags );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $theme->tags = implode( ', ', $theme->tags );
</del><span class="cx" style="display: block; padding: 0 10px"> $theme->stars = wp_star_rating(
</span><span class="cx" style="display: block; padding: 0 10px"> array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'rating' => $theme->rating,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -5702,8 +5687,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Map available theme properties to installed theme properties.
</span><span class="cx" style="display: block; padding: 0 10px"> $theme->id = $theme->slug;
</span><span class="cx" style="display: block; padding: 0 10px"> $theme->screenshot = array( $theme->screenshot_url );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $theme->authorAndUri = $theme->author;
- // The .org API can return the full parent theme details if passed the 'parent' arg, or if passed the 'template' option it'll return that in the event it's a child theme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $theme->authorAndUri = wp_kses( $theme->author['display_name'], $themes_allowedtags );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $theme->parent ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $theme->parent = $theme->parent['slug'];
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre>
</div>
</div>
</body>
</html>