WordPress.org

Make WordPress Core

Changeset 14732


Ignore:
Timestamp:
05/19/10 03:15:59 (5 years ago)
Author:
wpmuguru
Message:

restore single WP permalink settings per 2.9.X, related #13106, see #13303

File:
1 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-admin/options-permalink.php

    r14553 r14732  
    8888        $permalink_structure = $_POST['permalink_structure']; 
    8989        if ( ! empty( $permalink_structure ) ) 
    90             $permalink_structure = $prefix . preg_replace( '#/+#', '/', '/' . str_replace( '#', '', $permalink_structure ) ); 
     90            $permalink_structure = $blog_prefix . preg_replace( '#/+#', '/', '/' . str_replace( '#', '', $permalink_structure ) ); 
    9191        $wp_rewrite->set_permalink_structure( $permalink_structure ); 
    9292    } 
     
    9595        $category_base = $_POST['category_base']; 
    9696        if ( ! empty( $category_base ) ) 
    97             $category_base = $prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $category_base ) ); 
     97            $category_base = $blog_prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $category_base ) ); 
    9898        $wp_rewrite->set_category_base( $category_base ); 
    9999    } 
     
    102102        $tag_base = $_POST['tag_base']; 
    103103        if ( ! empty( $tag_base ) ) 
    104             $tag_base = $prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $tag_base ) ); 
     104            $tag_base = $blog_prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $tag_base ) ); 
    105105        $wp_rewrite->set_tag_base( $tag_base ); 
    106106    } 
     
    164164 
    165165<?php 
    166 if ( ! got_mod_rewrite() && ! $iis7_permalinks ) 
    167     $permalink_structure = preg_replace( '|^/?index\.php|', '', $permalink_structure ); 
    168  
    169166if ( is_multisite() && !is_subdomain_install() && is_main_site() ) { 
    170167    $permalink_structure = preg_replace( '|^/?blog|', '', $permalink_structure ); 
Note: See TracChangeset for help on using the changeset viewer.