<!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>[3225] sites/trunk/wordpress.org/public_html/wp-content: Plugin Directory: Rename Tags to Categories and add the extra taxonomies we plan on using.</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/3225">3225</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/3225","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>2016-05-24 04:49:07 +0000 (Tue, 24 May 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'>Plugin Directory: Rename Tags to Categories and add the extra taxonomies we plan on using.
See <a href="http://meta.trac.wordpress.org/ticket/1573">#1573</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclasscapabilitiesphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-capabilities.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclassplugindirectoryphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorywidgetsclassmetaphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/widgets/class-meta.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginsfrontpagephp">sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/front-page.php</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminmetaboxclassplugincategoriesphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-plugin-categories.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminmetaboxclassplugintagsphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-plugin-tags.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminmetaboxclassplugincategoriesphpfromrev3223sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminmetaboxclassplugintagsphp"></a>
<div class="copfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Copied: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-plugin-categories.php (from rev 3223, sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-plugin-tags.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/plugin-directory/admin/metabox/class-plugin-categories.php (rev 0)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-plugin-categories.php 2016-05-24 04:49:07 UTC (rev 3225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -0,0 +1,30 @@
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+namespace WordPressdotorg\Plugin_Directory\Admin\Metabox;
+
+/**
+ * The Plugin Categories metabox
+ *
+ * @package WordPressdotorg\Plugin_Directory\Admin\Metabox
+ */
+class Plugin_Categories {
+ /**
+ * Displays the categories metabox for plugins.
+ * The HTML here matches what Core uses.
+ *
+ * @param \WP_Post $post
+ */
+ static function display( $post ) {
+ ?>
+ <div id="taxonomy-plugin_category" class="categorydiv">
+ <div id="plugin_category-all" class="tabs-panel">
+ <?php // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks. ?>
+ <input type='hidden' name='tax_input[plugin_category][]' value='0' />
+ <ul id="plugin_tagchecklist" data-wp-lists="list:plugin_category" class="categorychecklist form-no-clear">
+ <?php wp_terms_checklist( $post->ID, array( 'taxonomy' => 'plugin_category' ) ); ?>
+ </ul>
+ </div>
+ </div>
+ <?php
+ }
+}
+
</ins></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryadminmetaboxclassplugintagsphp"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-plugin-tags.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/plugin-directory/admin/metabox/class-plugin-tags.php 2016-05-24 02:20:04 UTC (rev 3224)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/admin/metabox/class-plugin-tags.php 2016-05-24 04:49:07 UTC (rev 3225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,30 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php
-namespace WordPressdotorg\Plugin_Directory\Admin\Metabox;
-
-/**
- * The Plugin Tags metabox
- *
- * @package WordPressdotorg\Plugin_Directory\Admin\Metabox
- */
-class Plugin_Tags {
- /**
- * Displays the Tags metabox for plugins.
- * The HTML here matches what Core uses.
- *
- * @param \WP_Post $post
- */
- static function display( $post ) {
- ?>
- <div id="taxonomy-plugin_tag" class="categorydiv">
- <div id="plugin_tag-all" class="tabs-panel">
- <?php // Allows for an empty term set to be sent. 0 is an invalid Term ID and will be ignored by empty() checks. ?>
- <input type='hidden' name='tax_input[plugin_tag][]' value='0' />
- <ul id="plugin_tagchecklist" data-wp-lists="list:plugin_tag" class="categorychecklist form-no-clear">
- <?php wp_terms_checklist( $post->ID, array( 'taxonomy' => 'plugin_tag' ) ); ?>
- </ul>
- </div>
- </div>
- <?php
- }
-}
-
</del></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclasscapabilitiesphp"></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/plugin-directory/class-capabilities.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/plugin-directory/class-capabilities.php 2016-05-24 02:20:04 UTC (rev 3224)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-capabilities.php 2016-05-24 04:49:07 UTC (rev 3225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,7 +76,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'read' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'plugin_dashboard_access' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'plugin_edit_own' => true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'plugin_set_tags' => true,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'plugin_set_category' => true,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'plugin_add_committer' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'plugin_edit_others' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -92,7 +92,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'plugin_reject' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'plugin_disable' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'plugin_close' => true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'plugin_set_category' => true, // Special categories.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'plugin_set_section' => true, // Special categories.
</ins><span class="cx" style="display: block; padding: 0 10px"> 'manage_categories' => true, // Let them assign these special categories.
</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="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectoryclassplugindirectoryphp"></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/plugin-directory/class-plugin-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/plugin-directory/class-plugin-directory.php 2016-05-24 02:20:04 UTC (rev 3224)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/class-plugin-directory.php 2016-05-24 04:49:07 UTC (rev 3225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,6 +23,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'init', array( $this, 'register_shortcodes' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'widgets_init', array( $this, 'register_widgets' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'post_type_link', array( $this, 'package_link' ), 10, 2 );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ add_filter( 'term_link', array( $this, 'term_link' ), 10, 3 );
</ins><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'pre_insert_term', array( $this, 'pre_insert_term_prevent' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'pre_get_posts', array( $this, 'use_plugins_in_query' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'the_content', array( $this, 'filter_post_content_to_correct_page' ), 1 );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -94,46 +95,81 @@
</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">- register_taxonomy( 'plugin_category', 'plugin', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_taxonomy( 'plugin_section', 'plugin', array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'query_var' => 'plugin_category',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'query_var' => 'plugin_section',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'rewrite' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'show_ui' => current_user_can( 'plugin_set_category' ),
- 'show_admin_column' => current_user_can( 'plugin_set_category' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'show_ui' => current_user_can( 'plugin_set_section' ),
+ 'show_admin_column' => current_user_can( 'plugin_set_section' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'meta_box_cb' => 'post_categories_meta_box',
</span><span class="cx" style="display: block; padding: 0 10px"> 'capabilities' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'assign_terms' => 'manage_categories',
- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'assign_terms' => 'plugin_set_section',
+ ),
+ 'labels' => array(
+ 'name' => __( 'Plugin Sections', 'wporg-plugins' ),
+ ),
</ins><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">- register_taxonomy( 'plugin_tag', 'plugin', array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_taxonomy( 'plugin_category', 'plugin', array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => true, /* for tax_input[] handling on post saves. */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'query_var' => 'plugin_tag',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'query_var' => 'plugin_category',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'rewrite' => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => false,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'slug' => 'tags',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'slug' => 'category',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'with_front' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'ep_mask' => EP_TAGS,
</span><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'labels' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'name' => __( 'Plugin Tags', 'wporg-plugins' ),
- 'singular_name' => __( 'Plugin Tag', 'wporg-plugins' ),
- 'edit_item' => __( 'Edit Tag', 'wporg-plugins' ),
- 'update_item' => __( 'Update Tag', 'wporg-plugins' ),
- 'add_new_item' => __( 'Add New Tag', 'wporg-plugins' ),
- 'new_item_name' => __( 'New Tag Name', 'wporg-plugins' ),
- 'search_items' => __( 'Search Tags', 'wporg-plugins' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'name' => __( 'Plugin Categories', 'wporg-plugins' ),
+ 'singular_name' => __( 'Plugin Category', 'wporg-plugins' ),
+ 'edit_item' => __( 'Edit Category', 'wporg-plugins' ),
+ 'update_item' => __( 'Update Category', 'wporg-plugins' ),
+ 'add_new_item' => __( 'Add New Category', 'wporg-plugins' ),
+ 'new_item_name' => __( 'New Category Name', 'wporg-plugins' ),
+ 'search_items' => __( 'Search Categories', 'wporg-plugins' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_ui' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_admin_column' => true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'meta_box_cb' => array( __NAMESPACE__ . '\Admin\Metabox\Plugin_Tags', 'display' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'meta_box_cb' => array( __NAMESPACE__ . '\Admin\Metabox\Plugin_Categories', 'display' ),
</ins><span class="cx" style="display: block; padding: 0 10px"> 'capabilities' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'assign_terms' => 'plugin_set_tags'
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'assign_terms' => 'plugin_set_category'
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ register_taxonomy( 'plugin_built_for', 'plugin', array(
+ 'hierarchical' => true, /* for tax_input[] handling on post saves. */
+ 'query_var' => 'plugin_built_for',
+ 'rewrite' => false,
+ 'labels' => array(
+ 'name' => __( 'Built For', 'wporg-plugins' ),
+ ),
+ 'public' => true,
+ 'show_ui' => true,
+ 'show_admin_column' => false,
+ //'meta_box_cb' => array( __NAMESPACE__ . '\Admin\Metabox\Plugin_Categories', 'display' ),
+ 'capabilities' => array(
+ 'assign_terms' => 'plugin_set_category'
+ )
+ ) );
+
+ register_taxonomy( 'plugin_business_model', 'plugin', array(
+ 'hierarchical' => true, /* for tax_input[] handling on post saves. */
+ 'query_var' => 'plugin_business_model',
+ 'rewrite' => false,
+ 'labels' => array(
+ 'name' => __( 'Business Model', 'wporg-plugins' ),
+ ),
+ 'public' => true,
+ 'show_ui' => true,
+ 'show_admin_column' => false,
+ //'meta_box_cb' => array( __NAMESPACE__ . '\Admin\Metabox\Plugin_Categories', 'display' ),
+ 'capabilities' => array(
+ 'assign_terms' => 'plugin_set_category'
+ )
+ ) );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> register_post_status( 'pending', array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => _x( 'Pending', 'plugin status', 'wporg-plugins' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => false,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -230,9 +266,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // %postname% is required.
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_rewrite->set_permalink_structure( '/%postname%/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // /tags/%slug% is required for tags.
- $wp_rewrite->set_tag_base( '/tags' );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // /tags/ & /category/ shouldn't conflict
+ $wp_rewrite->set_tag_base( '/post-tags' );
+ $wp_rewrite->set_category_base( '/post-categories' );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add our custom capabilitie and roles.
+ Capabilities::add_roles();
+
</ins><span class="cx" style="display: block; padding: 0 10px"> // We require the WordPress.org Ratings plugin also be active.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_plugin_active( 'wporg-ratings/wporg-ratings.php' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> activate_plugin( 'wporg-ratings/wporg-ratings.php' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -318,6 +358,24 @@
</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><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Filter the permalink for terms to be more useful.
+ *
+ * @param string $termlink The generated term link.
+ * @param \WP_Term $term The term the link is for.
+ * @param string $taxonomy The taxonomy the term is in.
+ */
+ public function term_link( $termlink, $term, $taxonomy ) {
+ if ( 'plugin_business_model' == $taxonomy ) {
+ return false;
+ }
+ if ( 'plugin_built_for' == $taxonomy ) {
+ return $this->package_link( false, $this->get_plugin_post( $term->slug ) );
+ }
+
+ return $termlink;
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * Checks if the current users is a super admin before allowing terms to be added.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $term The term to add or update.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -350,11 +408,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> switch ( get_query_var( 'browse' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> case 'beta':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_query->query_vars['plugin_category'] = 'beta';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_query->query_vars['plugin_section'] = 'beta';
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'featured':
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $wp_query->query_vars['plugin_category'] = 'featured';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $wp_query->query_vars['plugin_section'] = 'featured';
</ins><span class="cx" style="display: block; padding: 0 10px"> break;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> case 'favorites':
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginsplugindirectorywidgetsclassmetaphp"></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/plugin-directory/widgets/class-meta.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/plugin-directory/widgets/class-meta.php 2016-05-24 02:20:04 UTC (rev 3224)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/plugin-directory/widgets/class-meta.php 2016-05-24 04:49:07 UTC (rev 3225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -42,7 +42,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <li><?php printf( __( 'Last updated: %s ago', 'wporg-plugins' ), '<span itemprop="dateModified" content="' . esc_attr( get_post_modified_time( 'c' ) ) . '">' . human_time_diff( get_post_modified_time() ) . '</span>' ); ?></li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li><?php printf( __( 'Active installs: %s', 'wporg-plugins' ), Template::active_installs( false ) ); ?></li>
</span><span class="cx" style="display: block; padding: 0 10px"> <li><?php printf( __( 'Category: %s', 'wporg-plugins' ), get_the_term_list( get_post()->ID, 'plugin_category', '', ', ' ) ); ?></li>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <li><?php printf( __( 'Designed to work with: %s', 'wporg-plugins' ), get_the_term_list( get_post()->ID, 'plugin_category', '', ', ' ) ); ?></li>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <?php if ( $works_with = get_the_term_list( get_post()->ID, 'plugin_built_for', '', ', ' ) ) : ?>
+ <li><?php printf( __( 'Designed to work with: %s', 'wporg-plugins' ), $works_with ); ?></li>
+ <?php endif; ?>
+ <?php if ( $business_model = get_the_term_list( get_post()->ID, 'plugin_business_model', '', ', ' ) ) : ?>
+ <li><?php printf( __( 'Business Model: %s', 'wporg-plugins' ), $business_model ); ?></li>
+ <?php endif; ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </ul>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span></span></pre></div>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentthemespubwporgpluginsfrontpagephp"></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-plugins/front-page.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-plugins/front-page.php 2016-05-24 02:20:04 UTC (rev 3224)
+++ sites/trunk/wordpress.org/public_html/wp-content/themes/pub/wporg-plugins/front-page.php 2016-05-24 04:49:07 UTC (rev 3225)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -29,13 +29,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $section_args = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'post_type' => 'plugin',
</span><span class="cx" style="display: block; padding: 0 10px"> 'posts_per_page' => 4,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'plugin_category' => $section_slug,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'plugin_section' => $section_slug,
</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 ( 'popular' === $section_slug ) :
</span><span class="cx" style="display: block; padding: 0 10px"> $section_args['meta_key'] = 'active_installs';
</span><span class="cx" style="display: block; padding: 0 10px"> $section_args['orderby'] = 'meta_value_num';
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- unset( $section_args['plugin_category'] );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ unset( $section_args['plugin_section'] );
</ins><span class="cx" style="display: block; padding: 0 10px"> endif;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $section_query = new \WP_Query( $section_args );
</span></span></pre>
</div>
</div>
</body>
</html>