<!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>[1416] sites/trunk/wordpress.org/public_html/wp-content: Theme Directory: Move some functions from the themes functions.php to the plugin instead.</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/1416">1416</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/1416","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>2015-03-19 07:14:42 +0000 (Thu, 19 Mar 2015)</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'>Theme Directory: Move some functions from the themes functions.php to the plugin instead.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectorythemedirectoryphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgthemesfunctionsphp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/functions.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsthemedirectorythemedirectoryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php 2015-03-18 22:49:53 UTC (rev 1415)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/theme-directory/theme-directory.php 2015-03-19 07:14:42 UTC (rev 1416)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,6 +31,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Things to change on activation.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wporg_themes_activate() {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ wporg_themes_init();
</ins><span class="cx" style="display: block; padding: 0 10px"> flush_rewrite_rules();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'wporg_themes_activation' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -98,9 +99,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu_name' => __( 'Theme Shops', 'wporg-themes' ),
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'supports' => array( 'title', 'editor', 'author', 'custom-fields' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'public' => true,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'public' => false,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'show_in_nav_menus' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'exclude_from_search' => true,
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'rewrite' => false,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu_icon' => 'dashicons-businessman',
</span><span class="cx" style="display: block; padding: 0 10px"> ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -599,3 +601,193 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'Tags' => $tags,
</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">+
+
+/**
+ * Bootstraps found themes for the frontend JS handler.
+ *
+ * @return array
+ */
+function wporg_themes_prepare_themes_for_js() {
+ global $wp_query;
+
+ include_once API_WPORGPATH . 'themes/info/1.0/class-themes-api.php';
+ $api = new Themes_API( 'get_result' );
+ $api->fields = array_merge( $api->fields, array(
+ 'description' => true,
+ 'sections' => false,
+ 'tested' => true,
+ 'requires' => true,
+ 'rating' => true,
+ 'ratings' => true,
+ 'downloaded' => true,
+ 'downloadlink' => true,
+ 'last_updated' => true,
+ 'homepage' => true,
+ 'tags' => true,
+ 'num_ratings' => true,
+ 'parent' => true,
+ 'theme_url' => true,
+ ) );
+
+ $themes = array_map( array( $api, 'fill_theme' ), $wp_query->posts );
+ $themes = array_map( 'wporg_themes_ajax_prepare_theme', $themes );
+
+ $request = array();
+ if ( get_query_var( 'browse' ) ) {
+ $request['browse'] = get_query_var( 'browse' );
+ } else if ( $wp_query->is_tag() ) {
+ $request['tag'] = (array) explode( '+', get_query_var( 'tag' ) );
+ }
+ else if ( $wp_query->is_search() ) {
+ $request['search'] = get_query_var( 's' );
+ }
+ else if ( $wp_query->is_author() ) {
+ $request['author'] = get_user_by( 'id', get_query_var( 'author' ) )->user_nicename;
+ }
+ else if ( $wp_query->is_singular( 'repopackage' ) ) {
+ $request['theme'] = get_query_var( 'name' );
+ }
+
+ return array(
+ 'themes' => $themes,
+ 'request' => $request,
+ 'total' => $wp_query->found_posts,
+ );
+ }
+
+
+/**
+ * Removes Core's built-in query-themes handler, so we can safely add ours later on.
+ */
+function wporg_themes_remove_ajax_action() {
+ remove_action( 'wp_ajax_query-themes', 'wp_ajax_query_themes', 1 );
+}
+add_action( 'wp_ajax_query-themes', 'wporg_themes_remove_ajax_action', -1 );
+
+/**
+ * A recreation of Core's implementation without capability check, since there is nothing to install.
+ */
+function wporg_themes_query_themes() {
+ $request = wp_unslash( $_REQUEST['request'] );
+ $request['fields'] = wp_parse_args( $request['fields'], array(
+ 'description' => true,
+ 'sections' => false,
+ 'tested' => true,
+ 'requires' => true,
+ 'rating' => true,
+ 'ratings' => true,
+ 'downloaded' => true,
+ 'downloadlink' => true,
+ 'last_updated' => true,
+ 'homepage' => true,
+ 'tags' => true,
+ 'num_ratings' => true,
+ 'parent' => true,
+ 'theme_url' => true,
+ ) );
+ $args = wp_parse_args( $request, array(
+ 'per_page' => 20,
+ ) );
+
+ include_once API_WPORGPATH . 'themes/info/1.0/class-themes-api.php';
+ $api = new Themes_API( 'query_themes', $args );
+ $api = $api->response;
+
+ if ( is_wp_error( $api ) ) {
+ wp_send_json_error();
+ }
+
+ foreach ( $api->themes as $key => $theme ) {
+ $api->themes[ $key ] = wporg_themes_ajax_prepare_theme( $theme );
+ }
+
+ wp_send_json_success( $api );
+}
+add_action( 'wp_ajax_query-themes', 'wporg_themes_query_themes' );
+add_action( 'wp_ajax_nopriv_query-themes', 'wporg_themes_query_themes' );
+
+function wporg_themes_theme_info() {
+ $request = wp_unslash( $_REQUEST['request'] );
+ $request['fields'] = wp_parse_args( $request['fields'], array(
+ 'description' => true,
+ 'sections' => false,
+ 'tested' => true,
+ 'requires' => true,
+ 'rating' => true,
+ 'ratings' => true,
+ 'downloaded' => true,
+ 'downloadlink' => true,
+ 'last_updated' => true,
+ 'homepage' => true,
+ 'tags' => true,
+ 'num_ratings' => true,
+ 'parent' => true,
+ 'theme_url' => true,
+ ) );
+
+ include_once API_WPORGPATH . 'themes/info/1.0/class-themes-api.php';
+ $api = new Themes_API( 'theme_information', $request );
+ $api = $api->response;
+
+ if ( empty( $api ) ) {
+ wp_send_json_error();
+ }
+
+ $api = wporg_themes_ajax_prepare_theme( $api );
+
+ wp_send_json_success( $api );
+}
+add_action( 'wp_ajax_theme-info', 'wporg_themes_theme_info' );
+add_action( 'wp_ajax_nopriv_theme-info', 'wporg_themes_theme_info' );
+
+function wporg_themes_ajax_prepare_theme( $theme ) {
+ global $themes_allowedtags;
+ if ( empty( $themes_allowedtags ) ) {
+ $themes_allowedtags = array(
+ 'a' => array( 'href' => array(), 'title' => array(), 'target' => array() ),
+ 'abbr' => array( 'title' => array() ),
+ 'acronym' => array( 'title' => array() ),
+ 'code' => array(),
+ 'pre' => array(),
+ 'em' => array(),
+ 'strong' => array(),
+ 'div' => array(),
+ 'p' => array(),
+ 'ul' => array(),
+ 'ol' => array(),
+ 'li' => array(),
+ 'h1' => array(),
+ 'h2' => array(),
+ 'h3' => array(),
+ 'h4' => array(),
+ 'h5' => array(),
+ 'h6' => array(),
+ 'img' => array( 'src' => array(), 'class' => array(), 'alt' => array() ),
+ );
+ }
+
+ $author = get_user_by( 'slug', $theme->author );
+ $theme->author = new StdClass;
+ foreach ( array( 'user_nicename', 'display_name' ) as $property ) {
+ $theme->author->$property = get_the_author_meta( $property, $author->ID );
+ }
+
+ $theme->name = wp_kses( $theme->name, $themes_allowedtags );
+ $theme->version = wp_kses( $theme->version, $themes_allowedtags );
+ $theme->description = wp_kses( $theme->description, $themes_allowedtags );
+ $theme->downloaded = number_format_i18n( $theme->downloaded );
+ $theme->rating_text = sprintf( _n( '(based on %s rating)', '(based on %s ratings)', $theme->num_ratings ), number_format_i18n( $theme->num_ratings ) );
+ $theme->num_ratings = number_format_i18n( $theme->num_ratings );
+ $theme->preview_url = set_url_scheme( $theme->preview_url );
+
+ if ( preg_match( '/screenshot.(jpg|jpeg|png|gif)/', $theme->screenshot_url, $match ) ) {
+ $theme->screenshot_url = sprintf( 'https://i0.wp.com/themes.svn.wordpress.org/%1$s/%2$s/%3$s',
+ $theme->slug,
+ $theme->version,
+ $match[0]
+ );
+ }
+
+ return $theme;
+}
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgthemesfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/functions.php 2015-03-18 22:49:53 UTC (rev 1415)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-themes/functions.php 2015-03-19 07:14:42 UTC (rev 1416)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -128,213 +128,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'wp_title', 'wporg_themes_wp_title', 10, 2 );
</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">- * Bootstraps found themes for the frontend JS handler.
- *
- * @return array
- */
-function wporg_themes_prepare_themes_for_js() {
- global $wp_query;
-
- include_once API_WPORGPATH . 'themes/info/1.0/class-themes-api.php';
- $api = new Themes_API( 'get_result' );
- $api->fields = array_merge( $api->fields, array(
- 'description' => true,
- 'sections' => false,
- 'tested' => true,
- 'requires' => true,
- 'rating' => true,
- 'ratings' => true,
- 'downloaded' => true,
- 'downloadlink' => true,
- 'last_updated' => true,
- 'homepage' => true,
- 'tags' => true,
- 'num_ratings' => true,
- 'parent' => true,
- 'theme_url' => true,
- ) );
-
- $themes = array_map( array( $api, 'fill_theme' ), $wp_query->posts );
- $themes = array_map( 'wporg_themes_ajax_prepare_theme', $themes );
-
- $request = array();
- if ( get_query_var( 'browse' ) ) {
- $request['browse'] = get_query_var( 'browse' );
- } else if ( $wp_query->is_tag() ) {
- $request['tag'] = (array) explode( '+', get_query_var( 'tag' ) );
- }
- else if ( $wp_query->is_search() ) {
- $request['search'] = get_query_var( 's' );
- }
- else if ( $wp_query->is_author() ) {
- $request['author'] = get_user_by( 'id', get_query_var( 'author' ) )->user_nicename;
- }
- else if ( $wp_query->is_singular( 'repopackage' ) ) {
- $request['theme'] = get_query_var( 'name' );
- }
-
- return array(
- 'themes' => $themes,
- 'request' => $request,
- 'total' => $wp_query->found_posts,
- );
- }
-
-/**
- * @param object $args
- * @param string $action
- *
- * @return array
- */
-function wporg_themes_api_args( $args, $action ) {
- if ( in_array( $action, array( 'query_themes', 'theme_information' ) ) ) {
- $args->per_page = 30;
- $args->fields['parent'] = true;
- $args->fields['ratings'] = true;
- $args->fields['tags'] = true;
- $args->fields['theme_url'] = true;
- }
-
- return $args;
-}
-add_filter( 'themes_api_args', 'wporg_themes_api_args', 10, 2 );
-
-/**
- * Removes Core's built-in query-themes handler, so we can safely add ours later on.
- */
-function wporg_themes_remove_ajax_action() {
- remove_action( 'wp_ajax_query-themes', 'wp_ajax_query_themes', 1 );
-}
-add_action( 'wp_ajax_query-themes', 'wporg_themes_remove_ajax_action', -1 );
-
-/**
- * A recreation of Core's implementation without capability check, since there is nothing to install.
- */
-function wporg_themes_query_themes() {
- $request = wp_unslash( $_REQUEST['request'] );
- $request['fields'] = wp_parse_args( $request['fields'], array(
- 'description' => true,
- 'sections' => false,
- 'tested' => true,
- 'requires' => true,
- 'rating' => true,
- 'ratings' => true,
- 'downloaded' => true,
- 'downloadlink' => true,
- 'last_updated' => true,
- 'homepage' => true,
- 'tags' => true,
- 'num_ratings' => true,
- 'parent' => true,
- 'theme_url' => true,
- ) );
- $args = wp_parse_args( $request, array(
- 'per_page' => 20,
- ) );
-
- include_once API_WPORGPATH . 'themes/info/1.0/class-themes-api.php';
- $api = new Themes_API( 'query_themes', $args );
- $api = $api->response;
-
- if ( is_wp_error( $api ) ) {
- wp_send_json_error();
- }
-
- foreach ( $api->themes as $key => $theme ) {
- $api->themes[ $key ] = wporg_themes_ajax_prepare_theme( $theme );
- }
-
- wp_send_json_success( $api );
-}
-add_action( 'wp_ajax_query-themes', 'wporg_themes_query_themes' );
-add_action( 'wp_ajax_nopriv_query-themes', 'wporg_themes_query_themes' );
-
-function wporg_themes_theme_info() {
- $request = wp_unslash( $_REQUEST['request'] );
- $request['fields'] = wp_parse_args( $request['fields'], array(
- 'description' => true,
- 'sections' => false,
- 'tested' => true,
- 'requires' => true,
- 'rating' => true,
- 'ratings' => true,
- 'downloaded' => true,
- 'downloadlink' => true,
- 'last_updated' => true,
- 'homepage' => true,
- 'tags' => true,
- 'num_ratings' => true,
- 'parent' => true,
- 'theme_url' => true,
- ) );
-
- include_once API_WPORGPATH . 'themes/info/1.0/class-themes-api.php';
- $api = new Themes_API( 'theme_information', $request );
- $api = $api->response;
-
- if ( empty( $api ) ) {
- wp_send_json_error();
- }
-
- $api = wporg_themes_ajax_prepare_theme( $api );
-
- wp_send_json_success( $api );
-}
-add_action( 'wp_ajax_theme-info', 'wporg_themes_theme_info' );
-add_action( 'wp_ajax_nopriv_theme-info', 'wporg_themes_theme_info' );
-
-function wporg_themes_ajax_prepare_theme( $theme ) {
- global $themes_allowedtags;
- if ( empty( $themes_allowedtags ) ) {
- $themes_allowedtags = array(
- 'a' => array( 'href' => array(), 'title' => array(), 'target' => array() ),
- 'abbr' => array( 'title' => array() ),
- 'acronym' => array( 'title' => array() ),
- 'code' => array(),
- 'pre' => array(),
- 'em' => array(),
- 'strong' => array(),
- 'div' => array(),
- 'p' => array(),
- 'ul' => array(),
- 'ol' => array(),
- 'li' => array(),
- 'h1' => array(),
- 'h2' => array(),
- 'h3' => array(),
- 'h4' => array(),
- 'h5' => array(),
- 'h6' => array(),
- 'img' => array( 'src' => array(), 'class' => array(), 'alt' => array() ),
- );
- }
-
- $author = get_user_by( 'slug', $theme->author );
- $theme->author = new StdClass;
- foreach ( array( 'user_nicename', 'display_name' ) as $property ) {
- $theme->author->$property = get_the_author_meta( $property, $author->ID );
- }
-
- $theme->name = wp_kses( $theme->name, $themes_allowedtags );
- $theme->version = wp_kses( $theme->version, $themes_allowedtags );
- $theme->description = wp_kses( $theme->description, $themes_allowedtags );
- $theme->downloaded = number_format_i18n( $theme->downloaded );
- $theme->rating_text = sprintf( _n( '(based on %s rating)', '(based on %s ratings)', $theme->num_ratings ), number_format_i18n( $theme->num_ratings ) );
- $theme->num_ratings = number_format_i18n( $theme->num_ratings );
- $theme->preview_url = set_url_scheme( $theme->preview_url );
-
- if ( preg_match( '/screenshot.(jpg|jpeg|png|gif)/', $theme->screenshot_url, $match ) ) {
- $theme->screenshot_url = sprintf( 'https://i0.wp.com/themes.svn.wordpress.org/%1$s/%2$s/%3$s',
- $theme->slug,
- $theme->version,
- $match[0]
- );
- }
-
- return $theme;
-}
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * Include view templates in the footer.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wporg_themes_view_templates() {
</span></span></pre>
</div>
</div>
</body>
</html>