Changes from trunk/wp-includes/link-template.php at r17228 to branches/3.1/wp-includes/link-template.php at r17583

File:

• branches/3.1/wp-includes/link-template.php (modified) (2 diffs)

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 {
@@ -2412 +2414 @@
         return;
 
-    echo "<link rel='shortlink' href='" . esc_url_raw( $shortlink ) . "' />\n";
+    echo "<link rel='shortlink' href='" . esc_url( $shortlink ) . "' />\n";
 }