Wordpress 3.1.3

[autoinstalls/wordpress.git] / wp-includes / link-template.php

diff --git a/wp-includes/link-template.php b/wp-includes/link-template.php
index 33f0a7dd50799a29532891ba4ead4dd636242b15..434d2217a9ddb2f4eed5c599cd516316afc07bea 100644 (file)
--- 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 "<link rel='shortlink' href='" . esc_url_raw( $shortlink ) . "' />\n";
+       echo "<link rel='shortlink' href='" . esc_url( $shortlink ) . "' />\n";
 }
 
 /**