Changeset 17519

Timestamp:

03/10/2011 04:25:40 AM (14 years ago)

Author:

markjaquith

Message:

Correctly handle PATHINFO CPTs and CTs that specify with_front=false. fixes #16807 for 3.1

Location:

branches/3.1/wp-includes

Files:

• link-template.php (modified) (1 diff)
• post.php (modified) (1 diff)
• rewrite.php (modified) (1 diff)
• version.php (modified) (1 diff)

branches/3.1/wp-includes/link-template.php

@@ -848 +848 @@
         if ( $post_type_obj->rewrite['with_front'] )
             $struct = $wp_rewrite->front . $struct;
+        else
+            $struct = $wp_rewrite->root . $struct;
         $link = home_url( user_trailingslashit( $struct, 'post_type_archive' ) );
     } else {

branches/3.1/wp-includes/post.php

@@ -988 +988 @@
             if ( $args->rewrite['with_front'] )
                 $archive_slug = substr( $wp_rewrite->front, 1 ) . $archive_slug;
+            else
+                $archive_slug = $wp_rewrite->root . $archive_slug;
 
             $wp_rewrite->add_rule( "{$archive_slug}/?$", "index.php?post_type=$post_type", 'top' );

branches/3.1/wp-includes/rewrite.php

@@ -1858 +1858 @@
         if ( $with_front )
             $struct = $this->front . $struct;
+        else
+            $struct = $this->root . $struct;
         $this->extra_permastructs[$name] = array($struct, $ep_mask);
     }

branches/3.1/wp-includes/version.php

@@ -30 +30 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 17510;
+$wp_db_version = 17516;
 
 /**