From cc4bc59293c18ee983255d06494ae7687a73a406 Mon Sep 17 00:00:00 2001 From: Sergey Biryukov Date: Sat, 16 Jul 2016 12:45:01 +0000 Subject: [PATCH] Permalinks: Rename `$usingpi` to `$using_index_permalinks` for clarity. See #37380. git-svn-id: https://develop.svn.wordpress.org/trunk@38067 602fd350-edb4-49c9-b593-d223f7449a82 --- src/wp-admin/options-permalink.php | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/wp-admin/options-permalink.php b/src/wp-admin/options-permalink.php index 978ffacd22..b6c52c517a 100644 --- a/src/wp-admin/options-permalink.php +++ b/src/wp-admin/options-permalink.php @@ -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']) ) { check_admin_referer('update-permalink'); @@ -129,12 +129,12 @@ if ( isset($_POST['permalink_structure']) || isset($_POST['category_base']) ) { $message = __( 'Permalink structure updated.' ); if ( $iis7_permalinks ) { - if ( $permalink_structure && ! $usingpi && ! $writable ) { + if ( $permalink_structure && ! $using_index_permalinks && ! $writable ) { $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!' ); } - } 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.' ); } @@ -233,7 +233,7 @@ printf( __( 'If you like, you may enter custom structures for your category and

web.config file were writable, we could do this automatically, but it isn’t so this is the url rewrite rule you should have in your web.config file. Click in the field and press CTRL + a to select all. Then insert this rule inside of the /<configuration>/<system.webServer>/<rewrite>/<rules> element in web.config file.') ?>

@@ -253,7 +253,7 @@ printf( __( 'If you like, you may enter custom structures for your category and

Documentation on Nginx configuration.' ); ?>

+ if ( $permalink_structure && ! $using_index_permalinks && ! $writable && $update_required ) : ?>

.htaccess file were writable, we could do this automatically, but it isn’t so these are the mod_rewrite rules you should have in your .htaccess file. Click in the field and press CTRL + a to select all.') ?>