Index: wp-admin/includes/ms.php =================================================================== --- wp-admin/includes/ms.php (revision 18465) +++ wp-admin/includes/ms.php (working copy) @@ -603,14 +603,17 @@ add_action( 'network_admin_notices', 'site_admin_notice' ); function avoid_blog_page_permalink_collision( $data, $postarr ) { - if ( is_subdomain_install() ) + if ( is_subdomain_install() || ! is_main_site() || empty( $data['post_name'] ) ) return $data; - if ( $data['post_type'] != 'page' ) + + $blog_prefix = apply_filters( 'ms_blog_prefix', '/blog' ); + + if ( ! empty( $blog_prefix ) ) return $data; - if ( !isset( $data['post_name'] ) || $data['post_name'] == '' ) + + // Ignore it if the post type is not public + if ( ! in_array( $data['post_type'], get_post_types( array( 'public' => true ) ) ) ) return $data; - if ( !is_main_site() ) - return $data; $post_name = $data['post_name']; $c = 0; Index: wp-admin/options-permalink.php =================================================================== --- wp-admin/options-permalink.php (revision 18465) +++ wp-admin/options-permalink.php (working copy) @@ -62,8 +62,11 @@ $prefix = $blog_prefix = ''; if ( ! got_mod_rewrite() && ! $iis7_permalinks ) $prefix = '/index.php'; -if ( is_multisite() && !is_subdomain_install() && is_main_site() ) - $blog_prefix = '/blog'; +if ( is_multisite() && !is_subdomain_install() && is_main_site() ) { + $blog_prefix = apply_filters( 'ms_blog_prefix', '/blog' ); + if ( ! empty( $blog_prefix ) && '/' != $blog_prefix[0] ) + $blog_prefix = '/' . $blog_prefix; +} if ( isset($_POST['permalink_structure']) || isset($_POST['category_base']) ) { check_admin_referer('update-permalink'); @@ -158,10 +161,12 @@
URLs which have question marks and lots of numbers in them, however WordPress offers you the ability to create a custom URL structure for your permalinks and archives. This can improve the aesthetics, usability, and forward-compatibility of your links. A number of tags are available, and here are some examples to get you started.'); ?>