Changeset 38067

Timestamp:

07/16/2016 12:45:01 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Permalinks: Rename $usingpi to $using_index_permalinks for clarity.

See #37380.

File:

• trunk/src/wp-admin/options-permalink.php (modified) (4 diffs)

trunk/src/wp-admin/options-permalink.php

@@ -89 +89 @@
 }
 
-$usingpi = $wp_rewrite->using_index_permalinks();
+$using_index_permalinks = $wp_rewrite->using_index_permalinks();
 
 if ( isset($_POST['permalink_structure']) || isset($_POST['category_base']) ) {
@@ -130 +130 @@
 
     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.' );
     }
@@ -234 +234 @@
 <?php if ( !is_multisite() ) { ?>
 <?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') ) : ?>
 <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>
@@ -254 +254 @@
     <p><?php _e( '<a href="https://codex.wordpress.org/Nginx">Documentation on Nginx configuration</a>.' ); ?></p>
 <?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>
 <form action="options-permalink.php" method="post">