X-Git-Url: https://scripts.mit.edu/gitweb/autoinstalls/wordpress.git/blobdiff_plain/6c8f14c09105d0afa4c1574215c59b5021040e76..138998bbd8f7a1ac38b2f1eacbdf7cd522be4b13:/wp-admin/options-permalink.php diff --git a/wp-admin/options-permalink.php b/wp-admin/options-permalink.php index 906361e8..4ec1c1b2 100644 --- a/wp-admin/options-permalink.php +++ b/wp-admin/options-permalink.php @@ -7,7 +7,7 @@ */ /** WordPress Administration Bootstrap */ -require_once('./admin.php'); +require_once( dirname( __FILE__ ) . '/admin.php' ); if ( ! current_user_can( 'manage_options' ) ) wp_die( __( 'You do not have sufficient permissions to manage options for this site.' ) ); @@ -19,15 +19,15 @@ get_current_screen()->add_help_tab( array( 'id' => 'overview', 'title' => __('Overview'), 'content' => '
' . __('Permalinks are the permanent URLs to your individual pages and blog posts, as well as your category and tag archives. A permalink is the web address used to link to your content. The URL to each post should be permanent, and never change — hence the name permalink.') . '
' . - '' . __('This screen allows you to choose your default permalink structure. You can choose from common settings or create custom URL structures.') . '
' . + '' . __( 'This screen allows you to choose your permalink structure. You can choose from common settings or create custom URL structures.' ) . '
' . '' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '
', ) ); get_current_screen()->add_help_tab( array( - 'id' => 'common-settings', - 'title' => __('Common Settings'), - 'content' => '' . __('Many people choose to use “pretty permalinks,” URLs that contain useful information such as the post title rather than generic post ID numbers. You can choose from any of the permalink formats under Common Settings, or can craft your own if you select Custom Structure.') . '
' . - '' . __('If you pick an option other than Default, your general URL path with structure tags, terms surrounded by %
, will also appear in the custom structure field and your path can be further modified there.') . '
' . __( 'Permalinks can contain useful information, such as the post date, title, or other elements. You can choose from any of the suggested permalink formats, or you can craft your own if you select Custom Structure.' ) . '
' . + '' . __( 'If you pick an option other than Plain, your general URL path with structure tags (terms surrounded by %
) will also appear in the custom structure field and your path can be further modified there.' ) . '
' . __('When you assign multiple categories or tags to a post, only one can show up in the permalink: the lowest numbered category. This applies if your custom structure includes %category%
or %tag%
.') . '
' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '
', ) ); @@ -41,46 +41,30 @@ get_current_screen()->add_help_tab( array( get_current_screen()->set_help_sidebar( '' . __('For more information:') . '
' . - '' . __('Documentation on Permalinks Settings') . '
' . - '' . __('Documentation on Using Permalinks') . '
' . - '' . __('Support Forums') . '
' + '' . __('Documentation on Permalinks Settings') . '
' . + '' . __('Documentation on Using Permalinks') . '
' . + '' . __('Support Forums') . '
' ); -/** - * Display JavaScript on the page. - * - * @since 3.5.0 - */ -function options_permalink_add_js() { - ?> - -set_tag_base( $tag_base ); } - create_initial_taxonomies(); + wp_redirect( admin_url( 'options-permalink.php?settings-updated=true' ) ); + exit; } -$permalink_structure = get_option('permalink_structure'); -$category_base = get_option('category_base'); -$tag_base = get_option( 'tag_base' ); +$category_base = get_option( 'category_base' ); +$tag_base = get_option( 'tag_base' ); +$update_required = false; if ( $iis7_permalinks ) { if ( ( ! file_exists($home_path . 'web.config') && win_is_writable($home_path) ) || win_is_writable($home_path . 'web.config') ) $writable = true; else $writable = false; +} elseif ( $is_nginx ) { + $writable = false; } else { - if ( ( ! file_exists($home_path . '.htaccess') && is_writable($home_path) ) || is_writable($home_path . '.htaccess') ) + if ( ( ! file_exists( $home_path . '.htaccess' ) && is_writable( $home_path ) ) || is_writable( $home_path . '.htaccess' ) ) { $writable = true; - else + } else { $writable = false; + $existing_rules = array_filter( extract_from_markers( $home_path . '.htaccess', 'WordPress' ) ); + $new_rules = array_filter( explode( "\n", $wp_rewrite->mod_rewrite_rules() ) ); + $update_required = ( $new_rules !== $existing_rules ); + } } if ( $wp_rewrite->using_index_permalinks() ) @@ -141,21 +132,27 @@ else flush_rewrite_rules(); -if (isset($_POST['submit'])) : ?> -+