Changeset 34749

Timestamp:

10/01/2015 08:38:40 PM (9 years ago)

Author:

jeremyfelt

Message:

MS: Provide better UI when a main site's /blog prefix is changed.

The main site on a new network is forced by default into using /blog as the prefix for its permalink structure. This can be changed easily through the network admin, though the options-permalink.php screen is then unusable to make further changes to the structure.

Now, if /blog/ is not at the beginning of the permalink_structure option, we do not force /blog as a prefix in the UI.

Fixes #12002.

File:

• trunk/src/wp-admin/options-permalink.php (modified) (3 diffs)

trunk/src/wp-admin/options-permalink.php

@@ -51 +51 @@
 $home_path = get_home_path();
 $iis7_permalinks = iis7_supports_permalinks();
+$permalink_structure = get_option( 'permalink_structure' );
 
 $prefix = $blog_prefix = '';
 if ( ! got_url_rewrite() )
     $prefix = '/index.php';
-if ( is_multisite() && !is_subdomain_install() && is_main_site() )
+
+/**
+ * In a subdirectory configuration of multisite, the `/blog` prefix is used by
+ * default on the main site to avoid collisions with other sites created on that
+ * network. If the `permalink_structure` option has been changed to remove this
+ * base prefix, WordPress core can no longer account for the possible collision.
+ */
+if ( is_multisite() && ! is_subdomain_install() && is_main_site() && 0 === strpos( $permalink_structure, '/blog/' ) ) {
     $blog_prefix = '/blog';
+}
 
 if ( isset($_POST['permalink_structure']) || isset($_POST['category_base']) ) {
@@ -95 +104 @@
 }
 
-$permalink_structure = get_option( 'permalink_structure' );
 $category_base       = get_option( 'category_base' );
 $tag_base            = get_option( 'tag_base' );
@@ -163 +171 @@
 
 <?php
-if ( is_multisite() && !is_subdomain_install() && is_main_site() ) {
+if ( is_multisite() && ! is_subdomain_install() && is_main_site() && 0 === strpos( $permalink_structure, '/blog/' ) ) {
     $permalink_structure = preg_replace( '|^/?blog|', '', $permalink_structure );
     $category_base = preg_replace( '|^/?blog|', '', $category_base );