diff -r c7c34916027a -r 177826044cd9 wp/wp-admin/options-permalink.php --- a/wp/wp-admin/options-permalink.php Mon Oct 14 18:06:33 2019 +0200 +++ b/wp/wp-admin/options-permalink.php Mon Oct 14 18:28:13 2019 +0200 @@ -9,50 +9,58 @@ /** WordPress Administration Bootstrap */ require_once( dirname( __FILE__ ) . '/admin.php' ); -if ( ! current_user_can( 'manage_options' ) ) +if ( ! current_user_can( 'manage_options' ) ) { wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) ); +} -$title = __('Permalink Settings'); +$title = __( 'Permalink Settings' ); $parent_file = 'options-general.php'; -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 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' => '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 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' => 'permalink-settings', - 'title' => __('Permalink Settings'), - 'content' => '

' . __( '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.') . '

', -) ); +get_current_screen()->add_help_tab( + array( + 'id' => 'permalink-settings', + 'title' => __( 'Permalink Settings' ), + 'content' => '

' . __( '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.' ) . '

', + ) +); -get_current_screen()->add_help_tab( array( - 'id' => 'custom-structures', - 'title' => __('Custom Structures'), - 'content' => '

' . __('The Optional fields let you customize the “category” and “tag” base names that will appear in archive URLs. For example, the page listing all posts in the “Uncategorized” category could be /topics/uncategorized instead of /category/uncategorized.') . '

' . - '

' . __('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' => 'custom-structures', + 'title' => __( 'Custom Structures' ), + 'content' => '

' . __( 'The Optional fields let you customize the “category” and “tag” base names that will appear in archive URLs. For example, the page listing all posts in the “Uncategorized” category could be /topics/uncategorized instead of /category/uncategorized.' ) . '

' . + '

' . __( 'You must click the Save Changes button at the bottom of the screen for new settings to take effect.' ) . '

', + ) +); get_current_screen()->set_help_sidebar( - '

' . __('For more information:') . '

' . - '

' . __('Documentation on Permalinks Settings') . '

' . - '

' . __('Documentation on Using Permalinks') . '

' . - '

' . __('Support Forums') . '

' + '

' . __( 'For more information:' ) . '

' . + '

' . __( 'Documentation on Permalinks Settings' ) . '

' . + '

' . __( 'Documentation on Using Permalinks' ) . '

' . + '

' . __( 'Support' ) . '

' ); -$home_path = get_home_path(); -$iis7_permalinks = iis7_supports_permalinks(); +$home_path = get_home_path(); +$iis7_permalinks = iis7_supports_permalinks(); $permalink_structure = get_option( 'permalink_structure' ); $prefix = $blog_prefix = ''; -if ( ! got_url_rewrite() ) +if ( ! got_url_rewrite() ) { $prefix = '/index.php'; +} /** * In a subdirectory configuration of multisite, the `/blog` prefix is used by @@ -64,22 +72,23 @@ $blog_prefix = '/blog'; } -$category_base = get_option( 'category_base' ); -$tag_base = get_option( 'tag_base' ); -$update_required = false; +$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') ) + if ( ( ! file_exists( $home_path . 'web.config' ) && win_is_writable( $home_path ) ) || win_is_writable( $home_path . 'web.config' ) ) { $writable = true; - else + } else { $writable = false; + } } elseif ( $is_nginx ) { $writable = false; } else { if ( ( ! file_exists( $home_path . '.htaccess' ) && is_writable( $home_path ) ) || is_writable( $home_path . '.htaccess' ) ) { $writable = true; } else { - $writable = false; + $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 ); @@ -88,21 +97,23 @@ $using_index_permalinks = $wp_rewrite->using_index_permalinks(); -if ( isset($_POST['permalink_structure']) || isset($_POST['category_base']) ) { - check_admin_referer('update-permalink'); +if ( isset( $_POST['permalink_structure'] ) || isset( $_POST['category_base'] ) ) { + check_admin_referer( 'update-permalink' ); if ( isset( $_POST['permalink_structure'] ) ) { - if ( isset( $_POST['selection'] ) && 'custom' != $_POST['selection'] ) + if ( isset( $_POST['selection'] ) && 'custom' != $_POST['selection'] ) { $permalink_structure = $_POST['selection']; - else + } else { $permalink_structure = $_POST['permalink_structure']; + } if ( ! empty( $permalink_structure ) ) { $permalink_structure = preg_replace( '#/+#', '/', '/' . str_replace( '#', '', $permalink_structure ) ); - if ( $prefix && $blog_prefix ) + if ( $prefix && $blog_prefix ) { $permalink_structure = $prefix . preg_replace( '#^/?index\.php#', '', $permalink_structure ); - else + } else { $permalink_structure = $blog_prefix . $permalink_structure; + } } $permalink_structure = sanitize_option( 'permalink_structure', $permalink_structure ); @@ -112,15 +123,17 @@ if ( isset( $_POST['category_base'] ) ) { $category_base = $_POST['category_base']; - if ( ! empty( $category_base ) ) - $category_base = $blog_prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $category_base ) ); + if ( ! empty( $category_base ) ) { + $category_base = $blog_prefix . preg_replace( '#/+#', '/', '/' . str_replace( '#', '', $category_base ) ); + } $wp_rewrite->set_category_base( $category_base ); } if ( isset( $_POST['tag_base'] ) ) { $tag_base = $_POST['tag_base']; - if ( ! empty( $tag_base ) ) - $tag_base = $blog_prefix . preg_replace('#/+#', '/', '/' . str_replace( '#', '', $tag_base ) ); + if ( ! empty( $tag_base ) ) { + $tag_base = $blog_prefix . preg_replace( '#/+#', '/', '/' . str_replace( '#', '', $tag_base ) ); + } $wp_rewrite->set_tag_base( $tag_base ); } @@ -154,21 +167,23 @@

- + -

+ number of tags are available, and here are some examples to get you started.' ), __( 'https://codex.wordpress.org/Using_Permalinks' ) ); - ?>

+ ?> +

$prefix . '/%postname%/', ); ?> -

+

- - + + - - + + - - + + - - + + - - + + - -

-

+

+topics as your category base would make your category links like %s/topics/uncategorized/. If you leave these blank the defaults will be used.' ), get_option( 'home' ) . $blog_prefix . $prefix ); ?>

+printf( __( 'If you like, you may enter custom structures for your category and tag URLs here. For example, using topics as your category base would make your category links like %s/topics/uncategorized/. If you leave these blank the defaults will be used.' ), get_option( 'home' ) . $blog_prefix . $prefix ); +?> +

- +
- + - - + + - + - + -
- - -

writable, we could do this automatically, but it isn’t so this is the url rewrite rule you should have in your %1$s file. Click in the field and press %3$s to select all. Then insert this rule inside of the %4$s element in %1$s file.' ), - 'web.config', - __( 'https://codex.wordpress.org/Changing_File_Permissions' ), - 'CTRL + a', - '/<configuration>/<system.webServer>/<rewrite>/<rules>' - ); -?>

+ + + +

+ writable, we could do this automatically, but it isn’t so this is the url rewrite rule you should have in your %1$s file. Click in the field and press %3$s to select all. Then insert this rule inside of the %4$s element in %1$s file.' ), + 'web.config', + __( 'https://codex.wordpress.org/Changing_File_Permissions' ), + 'CTRL + a', + '/<configuration>/<system.webServer>/<rewrite>/<rules>' + ); + ?> +

- +

-

web.config' - ); -?>

+

+ web.config' + ); + ?> +

-

writable, we could do this automatically, but it isn’t so this is the url rewrite rule you should have in your %2$s file. Create a new file, called %2$s in the root directory of your site. Click in the field and press %3$s to select all. Then insert this code into the %2$s file.' ), - __( 'https://codex.wordpress.org/Changing_File_Permissions' ), - 'web.config', - 'CTRL + a' - ); -?>

+

+ writable, we could do this automatically, but it isn’t so this is the url rewrite rule you should have in your %2$s file. Create a new file, called %2$s in the root directory of your site. Click in the field and press %3$s to select all. Then insert this code into the %2$s file.' ), + __( 'https://codex.wordpress.org/Changing_File_Permissions' ), + 'web.config', + 'CTRL + a' + ); + ?> +

- -

+ +

-

web.config' - ); -?>

+

+ web.config' + ); + ?> +

Documentation on Nginx configuration.' ); ?>

- -

writable, we could do this automatically, but it isn’t so these are the mod_rewrite rules you should have in your %1$s file. Click in the field and press %3$s to select all.' ), - '.htaccess', - __( 'https://codex.wordpress.org/Changing_File_Permissions' ), - 'CTRL + a' - ); -?>

+ +

+ writable, we could do this automatically, but it isn’t so these are the mod_rewrite rules you should have in your %1$s file. Click in the field and press %3$s to select all.' ), + '.htaccess', + __( 'https://codex.wordpress.org/Changing_File_Permissions' ), + 'CTRL + a' + ); + ?> +

- +