Changeset 14553

Timestamp:

05/10/2010 10:06:27 PM (16 years ago)

Author:

wpmuguru

Message:

revert non-rewrite permalink settings to be compatible with 2.9, see 13106

File:

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

trunk/wp-admin/options-permalink.php

@@ -76 +76 @@
 $iis7_permalinks = iis7_supports_permalinks();
 
-$prefix = '';
+$prefix = $blog_prefix = '';
 if ( ! got_mod_rewrite() && ! $iis7_permalinks )
-        $prefix .= '/index.php';
+        $prefix = '/index.php';
 if ( is_multisite() && !is_subdomain_install() && is_main_site() )
-        $prefix .= '/blog';
+        $blog_prefix = '/blog';
 
 if ( isset($_POST['permalink_structure']) || isset($_POST['category_base']) ) {
@@ -175 +175 @@
 $structures = array(
         '',
-        '/%year%/%monthnum%/%day%/%postname%/',
-        '/%year%/%monthnum%/%postname%/',
-        '/archives/%post_id%'
+        $prefix . '/%year%/%monthnum%/%day%/%postname%/',
+        $prefix . '/%year%/%monthnum%/%postname%/',
+        $prefix . '/archives/%post_id%'
         );
 ?>
@@ -188 +188 @@
         <tr>
                 <th><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[1]); ?>" class="tog" <?php checked($structures[1], $permalink_structure); ?> /> <?php _e('Day and name'); ?></label></th>
-                <td><code><?php echo get_option('home') . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/sample-post/'; ?></code></td>
+                <td><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . date('Y') . '/' . date('m') . '/' . date('d') . '/sample-post/'; ?></code></td>
         </tr>
         <tr>
                 <th><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[2]); ?>" class="tog" <?php checked($structures[2], $permalink_structure); ?> /> <?php _e('Month and name'); ?></label></th>
-                <td><code><?php echo get_option('home') . $prefix . '/' . date('Y') . '/' . date('m') . '/sample-post/'; ?></code></td>
+                <td><code><?php echo get_option('home') . $blog_prefix . $prefix . '/' . date('Y') . '/' . date('m') . '/sample-post/'; ?></code></td>
         </tr>
         <tr>
                 <th><label><input name="selection" type="radio" value="<?php echo esc_attr($structures[3]); ?>" class="tog" <?php checked($structures[3], $permalink_structure); ?> /> <?php _e('Numeric'); ?></label></th>
-                <td><code><?php echo get_option('home') . $prefix  ; ?>/archives/123</code></td>
+                <td><code><?php echo get_option('home') . $blog_prefix . $prefix; ?>/archives/123</code></td>
         </tr>
         <tr>
@@ -205 +205 @@
                 </th>
                 <td>
-                        <?php echo $prefix; ?>
+                        <?php echo $blog_prefix; ?>
                         <input name="permalink_structure" id="permalink_structure" type="text" value="<?php echo esc_attr($permalink_structure); ?>" class="regular-text code" />
                 </td>
@@ -221 +221 @@
         <tr>
                 <th><label for="category_base"><?php /* translators: prefix for category permalinks */ _e('Category base'); ?></label></th>
-                <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>
+                <td><?php echo $blog_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 echo $prefix; ?> <input name="tag_base" id="tag_base" type="text" value="<?php echo esc_attr($tag_base); ?>" class="regular-text code" /></td>
+                <td><?php echo $blog_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'); ?>