Changeset 14051

Timestamp:

04/10/2010 11:30:34 AM (14 years ago)

Author:

dd32

Message:

Check the appropriate radio option on the Permalinks page for the Root blog; Display index.php prefixes properly for the root Multisite Blog. Fixes #12952

File:

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

trunk/wp-admin/options-permalink.php

@@ -76 +76 @@
 $iis7_permalinks = iis7_supports_permalinks();
 
+$prefix = '';
+if ( ! got_mod_rewrite() && ! $iis7_permalinks )
+    $prefix .= '/index.php';
+if ( is_multisite() && !is_subdomain_install() && is_main_site() )
+    $prefix .= '/blog';
+
 if ( isset($_POST['permalink_structure']) || isset($_POST['category_base']) ) {
     check_admin_referer('update-permalink');
@@ -81 +87 @@
     if ( isset( $_POST['permalink_structure'] ) ) {
         $permalink_structure = $_POST['permalink_structure'];
-        if ( ! empty( $permalink_structure ) ) {
-            $permalink_structure = preg_replace( '#/+#', '/', '/' . str_replace( '#', '', $permalink_structure ) );
-            if ( is_multisite() && ! is_subdomain_install() && is_main_site() )
-                $permalink_structure = '/blog' . $permalink_structure;
-        }
+        if ( ! empty( $permalink_structure ) )
+            $permalink_structure = $prefix . preg_replace( '#/+#', '/', '/' . str_replace( '#', '', $permalink_structure ) );
         $wp_rewrite->set_permalink_structure( $permalink_structure );
     }
@@ -91 +94 @@
     if ( isset( $_POST['category_base'] ) ) {
         $category_base = $_POST['category_base'];
-        if (! empty( $category_base ) ) {
-            $category_base = preg_replace('#/+#', '/', '/' . str_replace( '#', '', $category_base ) );
-            if ( is_multisite() && ! is_subdomain_install() && is_main_site() )
-                $category_base = '/blog' . $category_base;
-        }
+        if ( ! empty( $category_base ) )
+            $category_base = $prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $category_base ) );
         $wp_rewrite->set_category_base( $category_base );
     }
@@ -101 +101 @@
     if ( isset( $_POST['tag_base'] ) ) {
         $tag_base = $_POST['tag_base'];
-        if ( ! empty( $tag_base ) ) {
-            $tag_base = preg_replace('#/+#', '/', '/' . str_replace( '#', '', $tag_base ) );
-            if ( is_multisite() && ! is_subdomain_install() && is_main_site() )
-                $tag_base = '/blog' . $tag_base;
-        }
+        if ( ! empty( $tag_base ) )
+            $tag_base = $prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $tag_base ) );
         $wp_rewrite->set_tag_base( $tag_base );
     }
@@ -167 +164 @@
 
 <?php
-$prefix = '';
-
 if ( ! got_mod_rewrite() && ! $iis7_permalinks )
-    $prefix = '/index.php';
+    $permalink_structure = preg_replace( '|^/?index\.php|', '', $permalink_structure );
+
+if ( is_multisite() && !is_subdomain_install() && is_main_site() ) {
+    $permalink_structure = preg_replace( '|^/?blog|', '', $permalink_structure );
+    $category_base = preg_replace( '|^/?blog|', '', $category_base );
+    $tag_base = preg_replace( '|^/?blog|', '', $tag_base );
+}
 
 $structures = array(
     '',
-    $prefix . '/%year%/%monthnum%/%day%/%postname%/',
-    $prefix . '/%year%/%monthnum%/%postname%/',
-    $prefix . '/archives/%post_id%'
+    '/%year%/%monthnum%/%day%/%postname%/',
+    '/%year%/%monthnum%/%postname%/',
+    '/archives/%post_id%'
     );
 ?>
@@ -199 +200 @@
     <tr>
         <th>
-            <label><input name="selection" id="custom_selection" type="radio" value="custom" class="tog"
-            <?php if ( !in_array($permalink_structure, $structures) ) { ?>
-            checked="checked"
-            <?php } ?>
-             />
+            <label><input name="selection" id="custom_selection" type="radio" value="custom" class="tog" <?php checked( !in_array($permalink_structure, $structures) ); ?> />
             <?php _e('Custom Structure'); ?>
             </label>
         </th>
         <td>
-            <?php if ( is_multisite() && !is_subdomain_install() && is_main_site() ) { echo "/blog"; $permalink_structure = preg_replace( "|^/?blog|", "", $permalink_structure ); }?>
+            <?php echo $prefix; ?>
             <input name="permalink_structure" id="permalink_structure" type="text" value="<?php echo esc_attr($permalink_structure); ?>" class="regular-text code" />
         </td>
@@ -224 +221 @@
     <tr>
         <th><label for="category_base"><?php /* translators: prefix for category permalinks */ _e('Category base'); ?></label></th>
-        <td><?php if ( is_multisite() && !is_subdomain_install() && is_main_site() ) { echo "/blog"; $category_base = preg_replace( "|^/?blog|", "", $category_base ); }?> <input name="category_base" id="category_base" type="text" value="<?php echo esc_attr( $category_base ); ?>" class="regular-text code" /></td>
+        <td><?php echo $prefix; ?> <input name="category_base" id="category_base" type="text" value="<?php echo esc_attr( $category_base ); ?>" class="regular-text code" /></td>
     </tr>
     <tr>
         <th><label for="tag_base"><?php _e('Tag base'); ?></label></th>
-        <td><?php if ( is_multisite() && !is_subdomain_install() && is_main_site() ) { echo "/blog"; $tag_base = preg_replace( "|^/?blog|", "", $tag_base ); }?> <input name="tag_base" id="tag_base" type="text" value="<?php echo esc_attr($tag_base); ?>" class="regular-text code" /></td>
+        <td><?php echo $prefix; ?> <input name="tag_base" id="tag_base" type="text" value="<?php echo esc_attr($tag_base); ?>" class="regular-text code" /></td>
     </tr>
     <?php do_settings_fields('permalink', 'optional'); ?>
@@ -240 +237 @@
   </form>
 <?php if ( !is_multisite() ) { ?>
-<?php if ($iis7_permalinks) :
+<?php if ( $iis7_permalinks ) :
     if ( isset($_POST['submit']) && $permalink_structure && ! $usingpi && ! $writable ) :
         if ( file_exists($home_path . 'web.config') ) : ?>