Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-03 15:08:10 +01:00
Code Issues Projects Releases Wiki Activity

Permalinks: Use "Plain" instead of "None" for the ?p-###, which is still a valid permalink structure, just not a "pretty" one.

Browse Source 
Permalinks are enabled by default (where supported) since in 4.2. When that change was made, it rended the "Default" label (previous to [35599]) inaccurate.

Props Ankit-K-Gupta.
Fixes #34509.

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


git-svn-id: http://core.svn.wordpress.org/trunk@35568 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2015-11-10 22:19:27 +00:00
parent 66dee42444
commit eba05b2c98
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -27,7 +27,7 @@ get_current_screen()->add_help_tab( array(
'id' => 'permalink-settings',
'title' => __('Permalink Settings'),
'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 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>' . __( 'If you pick an option other than Plain, 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>' . __('You must click the Save Changes button at the bottom of the screen for new settings to take effect.') . '</p>',
) );
@ -187,7 +187,7 @@ $structures = array(
<h2 class="title"><?php _e('Common Settings'); ?></h2>
<table class="form-table permalink-structure">
<tr>
<th><label><input name="selection" type="radio" value="" <?php checked('', $permalink_structure); ?> /> <?php _e( 'None' ); ?></label></th>
<th><label><input name="selection" type="radio" value="" <?php checked('', $permalink_structure); ?> /> <?php _e( 'Plain' ); ?></label></th>
<td><code><?php echo get_option('home'); ?>/?p=123</code></td>
</tr>
<tr>

2
wp-includes/version.php
View File

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