<!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>[9090] sites/trunk/wordpress.org/public_html/wp-content/plugins/support-helphub/inc/helphub-post-types/classes: Helphub: Don't use the translated titles for post type slugs.</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 { white-space: pre-line; 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/9090">9090</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/9090","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>2019-08-05 02:42:57 +0000 (Mon, 05 Aug 2019)</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'>Helphub: Don't use the translated titles for post type slugs.
While in english it's fine, not all locales want the translated slugs and it doesn't fit the rest of WordPress.org where there are no translated slugs.
See <a href="http://meta.trac.wordpress.org/ticket/4575">#4575</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginssupporthelphubinchelphubposttypesclassesclasshelphubposttypesposttypephp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-helphub/inc/helphub-post-types/classes/class-helphub-post-types-post-type.php</a></li>
<li><a href="#sitestrunkwordpressorgpublic_htmlwpcontentpluginssupporthelphubinchelphubposttypesclassesclasshelphubposttypesphp">sites/trunk/wordpress.org/public_html/wp-content/plugins/support-helphub/inc/helphub-post-types/classes/class-helphub-post-types.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="sitestrunkwordpressorgpublic_htmlwpcontentpluginssupporthelphubinchelphubposttypesclassesclasshelphubposttypesposttypephp"></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/support-helphub/inc/helphub-post-types/classes/class-helphub-post-types-post-type.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/support-helphub/inc/helphub-post-types/classes/class-helphub-post-types-post-type.php 2019-08-01 18:05:28 UTC (rev 9089)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-helphub/inc/helphub-post-types/classes/class-helphub-post-types-post-type.php 2019-08-05 02:42:57 UTC (rev 9090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -32,6 +32,24 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public $post_type;
</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">+ * The slug used in URLs for the post type items.
+ *
+ * @access public
+ * @since 1.0.0
+ * @var string
+ */
+ public $single_slug;
+
+ /**
+ * The slug used in URLs for the archive of the post type.
+ *
+ * @access public
+ * @since 1.0.0
+ * @var string
+ */
+ public $archive_slug;
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * The post type singular label.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -77,9 +95,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $singular The singular pronunciation of the post type name.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $plural The plural pronunciation of the post type name.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args The typical arguments allowed to register a post type.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $single_slug The 'singular' slug for the post type.
+ * @param string $archive_slug The 'archive' slug for the post type.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $taxonomies The list of taxonomies that the post type is associated with.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- public function __construct( $post_type = 'thing', $singular = '', $plural = '', $args = array(), $taxonomies = array() ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ public function __construct( $post_type = 'thing', $singular = '', $plural = '', $args = array(), $taxonomies = array(), $single_slug = false, $archive_slug = false ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->post_type = $post_type;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->singular = $singular;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->plural = $plural;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -86,6 +106,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $this->args = $args;
</span><span class="cx" style="display: block; padding: 0 10px"> $this->taxonomies = $taxonomies;
</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 ( ! $single_slug ) {
+ $single_slug = sanitize_title_with_dashes( $this->singular );
+ }
+ $this->single_slug = apply_filters( 'helphub_single_slug', $single_slug );
+
+ if ( ! $archive_slug ) {
+ $archive_slug = sanitize_title_with_dashes( $this->plural );
+ }
+ $this->archive_slug = apply_filters( 'helphub_archive_slug', $archive_slug );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> add_action( 'init', array( $this, 'register_post_type' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'init', array( $this, 'register_taxonomy' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -147,9 +177,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu_name' => $this->plural,
</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">- $single_slug = apply_filters( 'helphub_single_slug', sanitize_title_with_dashes( $this->singular ) );
- $archive_slug = apply_filters( 'helphub_archive_slug', sanitize_title_with_dashes( $this->plural ) );
-
</del><span class="cx" style="display: block; padding: 0 10px"> $defaults = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'labels' => $labels,
</span><span class="cx" style="display: block; padding: 0 10px"> 'public' => true,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -158,16 +185,16 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_in_menu' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'query_var' => true,
</span><span class="cx" style="display: block; padding: 0 10px"> 'rewrite' => array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'slug' => $single_slug,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'slug' => $this->single_slug,
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'capability_type' => 'post',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'has_archive' => $archive_slug,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'has_archive' => $this->archive_slug,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'hierarchical' => false,
</span><span class="cx" style="display: block; padding: 0 10px"> 'supports' => array( 'title', 'editor', 'excerpt', 'thumbnail', 'page-attributes', 'revisions' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu_position' => 5,
</span><span class="cx" style="display: block; padding: 0 10px"> 'menu_icon' => 'dashicons-smiley',
</span><span class="cx" style="display: block; padding: 0 10px"> 'show_in_rest' => true,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'rest_base' => $archive_slug,
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'rest_base' => $this->archive_slug,
</ins><span class="cx" style="display: block; padding: 0 10px"> 'rest_controller_class' => 'WP_REST_Posts_Controller',
</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_htmlwpcontentpluginssupporthelphubinchelphubposttypesclassesclasshelphubposttypesphp"></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/support-helphub/inc/helphub-post-types/classes/class-helphub-post-types.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/support-helphub/inc/helphub-post-types/classes/class-helphub-post-types.php 2019-08-01 18:05:28 UTC (rev 9089)
+++ sites/trunk/wordpress.org/public_html/wp-content/plugins/support-helphub/inc/helphub-post-types/classes/class-helphub-post-types.php 2019-08-05 02:42:57 UTC (rev 9090)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -127,19 +127,37 @@
</span><span class="cx" style="display: block; padding: 0 10px"> require_once( dirname( __FILE__ ) . '/class-helphub-post-types-taxonomy.php' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->post_types['post'] = new HelpHub_Post_Types_Post_Type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'post', __( 'Post', 'wporg-forums' ), __( 'Posts', 'wporg-forums' ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'post',
+ __( 'Post', 'wporg-forums' ),
+ __( 'Posts', 'wporg-forums' ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu_icon' => 'dashicons-post',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ array(),
+ 'post',
+ 'posts'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->post_types['helphub_article'] = new HelpHub_Post_Types_Post_Type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'helphub_article', __( 'Article', 'wporg-forums' ), __( 'Articles', 'wporg-forums' ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'helphub_article',
+ __( 'Article', 'wporg-forums' ),
+ __( 'Articles', 'wporg-forums' ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu_icon' => 'dashicons-media-document',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ array(),
+ 'article',
+ 'articles'
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $this->post_types['helphub_version'] = new HelpHub_Post_Types_Post_Type(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'helphub_version', __( 'WordPress Version', 'wporg-forums' ), __( 'WordPress Versions', 'wporg-forums' ), array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'helphub_version',
+ __( 'WordPress Version', 'wporg-forums' ),
+ __( 'WordPress Versions', 'wporg-forums' ),
+ array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 'menu_icon' => 'dashicons-wordpress',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- )
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ),
+ array(),
+ 'wordpress-version',
+ 'wordpress-versions'
</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"> /* Post Types - End */
</span></span></pre>
</div>
</div>
</body>
</html>