Ticket #37376: 37376.diff

src/wp-includes/class-wp-post-type.php

@@ -226 +226 @@
          */
         public $has_archive = false;
 
+        /**
+         * Whether there should be post type singles, or if a string, the single slug to use.
+         *
+         * Will generate the proper rewrite rules if $rewrite is enabled. Default true.
+         *
+         * @since 5.0.0
+         * @var bool|string $has_string
+         */
+        public $has_single = true;
+
         /**
          * Sets the query_var key for this post type.
          *
@@ -398 +408 @@
                         'register_meta_box_cb'  => null,
                         'taxonomies'            => array(),
                         'has_archive'           => false,
+                        'has_single'            => true,
                         'rewrite'               => true,
                         'query_var'             => true,
                         'can_export'            => true,
@@ -537 +548 @@
                 }
 
                 if ( false !== $this->rewrite && ( is_admin() || '' != get_option( 'permalink_structure' ) ) ) {
-                        if ( $this->hierarchical ) {
-                                add_rewrite_tag( "%$this->name%", '(.+?)', $this->query_var ? "{$this->query_var}=" : "post_type=$this->name&pagename=" );
-                        } else {
-                                add_rewrite_tag( "%$this->name%", '([^/]+)', $this->query_var ? "{$this->query_var}=" : "post_type=$this->name&name=" );
+                        if ( $this->has_single ) {
+                                if ( $this->hierarchical ) {
+                                        add_rewrite_tag( "%$this->name%", '(.+?)', $this->query_var ? "{$this->query_var}=" : "post_type=$this->name&pagename=" );
+                                } else {
+                                        add_rewrite_tag( "%$this->name%", '([^/]+)', $this->query_var ? "{$this->query_var}=" : "post_type=$this->name&name=" );
+                                }
                         }
 
                         if ( $this->has_archive ) {

src/wp-includes/link-template.php

@@ -256 +256 @@
  * @param int|WP_Post $id        Optional. Post ID or post object. Default is the global `$post`.
  * @param bool        $leavename Optional, defaults to false. Whether to keep post name. Default false.
  * @param bool        $sample    Optional, defaults to false. Is it a sample permalink. Default false.
- * @return string|WP_Error The post permalink.
+ * @return string|false|WP_Error The post permalink.
  */
 function get_post_permalink( $id = 0, $leavename = false, $sample = false ) {
         global $wp_rewrite;
@@ -269 +269 @@
 
         $post_link = $wp_rewrite->get_extra_permastruct( $post->post_type );
 
-        $slug = $post->post_name;
-
         $draft_or_pending = get_post_status( $post ) && in_array( get_post_status( $post ), array( 'draft', 'pending', 'auto-draft', 'future' ) );
 
         $post_type = get_post_type_object( $post->post_type );
 
+        if ( !$post_type->has_single ) {
+                return false;
+        }
+
+        $slug = is_string($post_type->has_single) ? $post_type->has_single : $post->post_name;
+
         if ( $post_type->hierarchical ) {
                 $slug = get_page_uri( $post );
         }
@@ -3791 +3795 @@
         if ( ! empty( $post_id ) ) {
                 $post_type = get_post_type_object( $post->post_type );
 
+                if ( false === $post_type->has_single ) {
+                        return '';
+                }
+
                 if ( 'page' === $post->post_type && $post->ID == get_option( 'page_on_front' ) && 'page' == get_option( 'show_on_front' ) ) {
                         $shortlink = home_url( '/' );
                 } elseif ( $post_type->public ) {

src/wp-includes/post.php

@@ -1813 +1813 @@
                 }
         }
 
-        return $post_type->publicly_queryable || ( $post_type->_builtin && $post_type->public );
+        return $post_type->publicly_queryable || ( $post_type->has_single && $post_type->_builtin && $post_type->public );
 }
 
 /**
@@ -4797 +4797 @@
                 return false;
         }
 
-        $uri = $page->post_name;
+        $post_type = get_post_type_object( $page->post_type );
+
+        $uri = 'page' !== $page->post_type && is_string( $post_type->has_single ) ? $post_type->has_single : $page->post_name;
 
         foreach ( $page->ancestors as $parent ) {
                 $parent = get_post( $parent );