WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Permalinks: Rename the "Default" permalink structure to "None" as permalinks have been enabled by default (where supported) since 4.2. 

Updates help tabs and contextual text to match.

Props johnbillion, DrewAPicture.
Fixes #34509.

Built from https://develop.svn.wordpress.org/trunk@35599


git-svn-id: http://core.svn.wordpress.org/trunk@35563 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2015-11-10 06:58:25 +00:00
parent 626549448a
commit c5a8c3aa86
2 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
wp-admin/options-permalink.php
View File

@ -19,15 +19,15 @@ get_current_screen()->add_help_tab( array(
'id' => 'overview', 'id' => 'overview',
'title' => __('Overview'), 'title' => __('Overview'),
'content' => '<p>' . __('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 &#8212; hence the name permalink.') . '</p>' . 'content' => '<p>' . __('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 &#8212; hence the name permalink.') . '</p>' .
'<p>' . __('This screen allows you to choose your default permalink structure. You can choose from common settings or create custom URL structures.') . '</p>' . '<p>' . __( 'This screen allows you to choose your permalink structure. You can choose from common settings or create custom URL structures.' ) . '</p>' .
'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>', '<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
) ); ) );
get_current_screen()->add_help_tab( array( get_current_screen()->add_help_tab( array(
'id' => 'common-settings', 'id' => 'permalink-settings',
'title' => __('Common Settings'), 'title' => __('Permalink Settings'),
'content' => '<p>' . __('Many people choose to use &#8220;pretty permalinks,&#8221; 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.') . '</p>' . 'content' => '<p>' . __( '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.' ) . '</p>' .
'<p>' . __('If you pick an option other than Default, your general URL path with structure tags, terms surrounded by <code>%</code>, will also appear in the custom structure field and your path can be further modified there.') . '</p>' . '<p>' . __( 'If you pick an option other than None, your general URL path with structure tags (terms surrounded by <code>%</code>) will also appear in the custom structure field and your path can be further modified there.' ) . '</p>' .
'<p>' . __('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 <code>%category%</code> or <code>%tag%</code>.') . '</p>' . '<p>' . __('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 <code>%category%</code> or <code>%tag%</code>.') . '</p>' .
'<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>', '<p>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
) ); ) );
@ -167,7 +167,7 @@ if ( ! is_multisite() ) {
<form name="form" action="options-permalink.php" method="post"> <form name="form" action="options-permalink.php" method="post">
<?php wp_nonce_field('update-permalink') ?> <?php wp_nonce_field('update-permalink') ?>
<p><?php _e('By default WordPress uses web <abbr title="Universal Resource Locator">URL</abbr>s which have question marks and lots of numbers in them; however, WordPress offers you the ability to create a custom URL structure for your permalinks and archives. This can improve the aesthetics, usability, and forward-compatibility of your links. A <a href="https://codex.wordpress.org/Using_Permalinks">number of tags are available</a>, and here are some examples to get you started.'); ?></p> <p><?php _e( 'WordPress offers you the ability to create a custom URL structure for your permalinks and archives. Custom URL structures can improve the aesthetics, usability, and forward-compatibility of your links. A <a href="https://codex.wordpress.org/Using_Permalinks">number of tags are available</a>, and here are some examples to get you started.' ); ?></p>
<?php <?php
if ( is_multisite() && ! is_subdomain_install() && is_main_site() && 0 === strpos( $permalink_structure, '/blog/' ) ) { if ( is_multisite() && ! is_subdomain_install() && is_main_site() && 0 === strpos( $permalink_structure, '/blog/' ) ) {
@ -187,7 +187,7 @@ $structures = array(
<h2 class="title"><?php _e('Common Settings'); ?></h2> <h2 class="title"><?php _e('Common Settings'); ?></h2>
<table class="form-table permalink-structure"> <table class="form-table permalink-structure">
<tr> <tr>
<th><label><input name="selection" type="radio" value="" <?php checked('', $permalink_structure); ?> /> <?php _e('Default'); ?></label></th> <th><label><input name="selection" type="radio" value="" <?php checked('', $permalink_structure); ?> /> <?php _e( 'None' ); ?></label></th>
<td><code><?php echo get_option('home'); ?>/?p=123</code></td> <td><code><?php echo get_option('home'); ?>/?p=123</code></td>
</tr> </tr>
<tr> <tr>

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.4-beta3-35598'; $wp_version = '4.4-beta3-35599';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.