diff --git src/wp-includes/feed-atom.php src/wp-includes/feed-atom.php
index e9e3f49528..f43398e103 100644
|
|
|
6 | 6 | */ |
7 | 7 | |
8 | 8 | header( 'Content-Type: ' . feed_content_type( 'atom' ) . '; charset=' . get_option( 'blog_charset' ), true ); |
9 | | $more = 1; |
10 | 9 | |
11 | 10 | echo '<?xml version="1.0" encoding="' . get_option( 'blog_charset' ) . '"?' . '>'; |
12 | 11 | |
diff --git src/wp-includes/link-template.php src/wp-includes/link-template.php
index a34b34b6ce..44c1c6a8eb 100644
|
|
function edit_term_link( $link = '', $before = '', $after = '', $term = null, $d |
1144 | 1144 | return; |
1145 | 1145 | } |
1146 | 1146 | |
1147 | | $tax = get_taxonomy( $term->taxonomy ); |
1148 | 1147 | if ( ! current_user_can( 'edit_term', $term->term_id ) ) { |
1149 | 1148 | return; |
1150 | 1149 | } |
diff --git src/wp-includes/ms-functions.php src/wp-includes/ms-functions.php
index 09ee2a5c53..d108cf8feb 100644
|
|
function get_blog_permalink( $blog_id, $post_id ) { |
330 | 330 | * |
331 | 331 | * @since MU (3.0.0) |
332 | 332 | * |
333 | | * @global wpdb $wpdb WordPress database abstraction object. |
334 | 333 | * |
335 | 334 | * @param string $domain Website domain. |
336 | 335 | * @param string $path Optional. Not required for subdomain installations. Default '/'. |
diff --git src/wp-includes/ms-load.php src/wp-includes/ms-load.php
index afac9b1147..bfdf6ac29b 100644
|
|
function ms_load_current_site_and_network( $domain, $path, $subdomain = false ) |
393 | 393 | if ( empty( $current_blog ) && wp_installing() ) { |
394 | 394 | $current_blog = new stdClass(); |
395 | 395 | $current_blog->blog_id = 1; |
396 | | $blog_id = 1; |
397 | 396 | $current_blog->public = 1; |
398 | 397 | } |
399 | 398 | |