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

Permalinks: Rename `$usingpi` to `$using_index_permalinks` for clarity. 

See #37380.
Built from https://develop.svn.wordpress.org/trunk@38067


git-svn-id: http://core.svn.wordpress.org/trunk@38008 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Sergey Biryukov 2016-07-16 12:46:29 +00:00
parent 07c9671cac
commit 5cce706f3d
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -88,7 +88,7 @@ if ( $iis7_permalinks ) {
} }
} }
$usingpi = $wp_rewrite->using_index_permalinks(); $using_index_permalinks = $wp_rewrite->using_index_permalinks();
if ( isset($_POST['permalink_structure']) || isset($_POST['category_base']) ) { if ( isset($_POST['permalink_structure']) || isset($_POST['category_base']) ) {
check_admin_referer('update-permalink'); check_admin_referer('update-permalink');
@ -129,12 +129,12 @@ if ( isset($_POST['permalink_structure']) || isset($_POST['category_base']) ) {
$message = __( 'Permalink structure updated.' ); $message = __( 'Permalink structure updated.' );
if ( $iis7_permalinks ) { if ( $iis7_permalinks ) {
if ( $permalink_structure && ! $usingpi && ! $writable ) { if ( $permalink_structure && ! $using_index_permalinks && ! $writable ) {
$message = __( 'You should update your web.config now.' ); $message = __( 'You should update your web.config now.' );
} elseif ( $permalink_structure && ! $usingpi && $writable ) { } elseif ( $permalink_structure && ! $using_index_permalinks && $writable ) {
$message = __( 'Permalink structure updated. Remove write access on web.config file now!' ); $message = __( 'Permalink structure updated. Remove write access on web.config file now!' );
} }
} elseif ( ! $is_nginx && $permalink_structure && ! $usingpi && ! $writable && $update_required ) { } elseif ( ! $is_nginx && $permalink_structure && ! $using_index_permalinks && ! $writable && $update_required ) {
$message = __( 'You should update your .htaccess now.' ); $message = __( 'You should update your .htaccess now.' );
} }
@ -233,7 +233,7 @@ printf( __( 'If you like, you may enter custom structures for your category and
</form> </form>
<?php if ( !is_multisite() ) { ?> <?php if ( !is_multisite() ) { ?>
<?php if ( $iis7_permalinks ) : <?php if ( $iis7_permalinks ) :
if ( isset($_POST['submit']) && $permalink_structure && ! $usingpi && ! $writable ) : if ( isset($_POST['submit']) && $permalink_structure && ! $using_index_permalinks && ! $writable ) :
if ( file_exists($home_path . 'web.config') ) : ?> if ( file_exists($home_path . 'web.config') ) : ?>
<p><?php _e('If your <code>web.config</code> file were <a href="https://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so this is the url rewrite rule you should have in your <code>web.config</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all. Then insert this rule inside of the <code>/&lt;configuration&gt;/&lt;system.webServer&gt;/&lt;rewrite&gt;/&lt;rules&gt;</code> element in <code>web.config</code> file.') ?></p> <p><?php _e('If your <code>web.config</code> file were <a href="https://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so this is the url rewrite rule you should have in your <code>web.config</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all. Then insert this rule inside of the <code>/&lt;configuration&gt;/&lt;system.webServer&gt;/&lt;rewrite&gt;/&lt;rules&gt;</code> element in <code>web.config</code> file.') ?></p>
<form action="options-permalink.php" method="post"> <form action="options-permalink.php" method="post">
@ -253,7 +253,7 @@ printf( __( 'If you like, you may enter custom structures for your category and
<?php elseif ( $is_nginx ) : ?> <?php elseif ( $is_nginx ) : ?>
<p><?php _e( '<a href="https://codex.wordpress.org/Nginx">Documentation on Nginx configuration</a>.' ); ?></p> <p><?php _e( '<a href="https://codex.wordpress.org/Nginx">Documentation on Nginx configuration</a>.' ); ?></p>
<?php else: <?php else:
if ( $permalink_structure && ! $usingpi && ! $writable && $update_required ) : ?> if ( $permalink_structure && ! $using_index_permalinks && ! $writable && $update_required ) : ?>
<p><?php _e('If your <code>.htaccess</code> file were <a href="https://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so these are the mod_rewrite rules you should have in your <code>.htaccess</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all.') ?></p> <p><?php _e('If your <code>.htaccess</code> file were <a href="https://codex.wordpress.org/Changing_File_Permissions">writable</a>, we could do this automatically, but it isn&#8217;t so these are the mod_rewrite rules you should have in your <code>.htaccess</code> file. Click in the field and press <kbd>CTRL + a</kbd> to select all.') ?></p>
<form action="options-permalink.php" method="post"> <form action="options-permalink.php" method="post">
<?php wp_nonce_field('update-permalink') ?> <?php wp_nonce_field('update-permalink') ?>

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.6-beta3-38066'; $wp_version = '4.6-beta3-38067';
/** /**
* 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.