X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/f9001779751f83dc8a10e478bfecb4d8dd5f964c..refs/tags/wordpress-3.1.1:/wp-includes/link-template.php?ds=sidebyside
diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php
index 33f0a7dd..434d2217 100644
--- a/wp-includes/link-template.php
+++ b/wp-includes/link-template.php
@@ -847,6 +847,8 @@ function get_post_type_archive_link( $post_type ) {
$struct = ( true === $post_type_obj->has_archive ) ? $post_type_obj->rewrite['slug'] : $post_type_obj->has_archive;
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 {
$link = home_url( '?post_type=' . $post_type );
@@ -2411,7 +2413,7 @@ function wp_shortlink_wp_head() {
if ( empty( $shortlink ) )
return;
- echo "\n";
+ echo "\n";
}
/**