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

File:

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

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