<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[53710] trunk/src/wp-admin: Coding Standards: Improve readability of `wp-admin/options-permalink.php`.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/53710">53710</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/53710","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-07-16 16:18:37 +0000 (Sat, 16 Jul 2022)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Coding Standards: Improve readability of `wp-admin/options-permalink.php`.
Includes:
* Wrapping longer lines and reducing alignment levels to fit more data on the screen.
* Restoring `esc_attr()` for input values, which may include translatable parts.
* Adding comments to closing `</div>` tags and PHP `endif` statements.
* Reducing the context switching between HTML and PHP.
* Balancing PHP conditionals to better reflect the structure.
* Removing repeated function calls to improve performance.
* Renaming some variables for clarity and consistency.
Follow-up to <a href="https://core.trac.wordpress.org/changeset/470">[470]</a>, <a href="https://core.trac.wordpress.org/changeset/601">[601]</a>, <a href="https://core.trac.wordpress.org/changeset/963">[963]</a>, <a href="https://core.trac.wordpress.org/changeset/1227">[1227]</a>, <a href="https://core.trac.wordpress.org/changeset/1664">[1664]</a>, <a href="https://core.trac.wordpress.org/changeset/2746">[2746]</a>, <a href="https://core.trac.wordpress.org/changeset/3029">[3029]</a>, <a href="https://core.trac.wordpress.org/changeset/6976">[6976]</a>, <a href="https://core.trac.wordpress.org/changeset/7230">[7230]</a>, <a href="https://core.trac.wordpress.org/changeset/11350">[11350]</a>, <a href="https://core.trac.wordpress.org/changeset/14051">[14051]</a>, <a href="https://core.trac.wordpress.org/changeset/14553">[14553]</a>, <a href="https://core.trac.wordpress.org/changeset/21891">[21891]</a>, <a href="https://core.trac.wordpress.org/changeset/34691">[34691]</a>, <a href="https:
//core.trac.wordpress.org/changeset/34749">[34749]</a>, <a href="https://core.trac.wordpress.org/changeset/37747">[37747]</a>, <a href="https://core.trac.wordpress.org/changeset/38066">[38066]</a>, <a href="https://core.trac.wordpress.org/changeset/41182">[41182]</a>, <a href="https://core.trac.wordpress.org/changeset/41986">[41986]</a>, <a href="https://core.trac.wordpress.org/changeset/42343">[42343]</a>, <a href="https://core.trac.wordpress.org/changeset/43571">[43571]</a>, <a href="https://core.trac.wordpress.org/changeset/48710">[48710]</a>, <a href="https://core.trac.wordpress.org/changeset/50830">[50830]</a>, <a href="https://core.trac.wordpress.org/changeset/51892">[51892]</a>, <a href="https://core.trac.wordpress.org/changeset/53706">[53706]</a>.
See <a href="https://core.trac.wordpress.org/ticket/55647">#55647</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmincssformscss">trunk/src/wp-admin/css/forms.css</a></li>
<li><a href="#trunksrcwpadminoptionspermalinkphp">trunk/src/wp-admin/options-permalink.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmincssformscss"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/css/forms.css</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/css/forms.css 2022-07-16 01:06:40 UTC (rev 53709)
+++ trunk/src/wp-admin/css/forms.css 2022-07-16 16:18:37 UTC (rev 53710)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1085,7 +1085,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> .form-table.permalink-structure .structure-selection .row > div {
</span><span class="cx" style="display: block; padding: 0 10px"> max-width: calc(100% - 24px);
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- margin-left: 4px;
</del><span class="cx" style="display: block; padding: 0 10px"> display: inline-flex;
</span><span class="cx" style="display: block; padding: 0 10px"> flex-direction: column;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpadminoptionspermalinkphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/options-permalink.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-permalink.php 2022-07-16 01:06:40 UTC (rev 53709)
+++ trunk/src/wp-admin/options-permalink.php 2022-07-16 16:18:37 UTC (rev 53710)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -57,8 +57,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $help_sidebar_content = '<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( '<a href="https://wordpress.org/support/article/settings-permalinks-screen/">Documentation on Permalinks Settings</a>' ) . '</p>' .
- '<p>' . __( '<a href="https://wordpress.org/support/article/using-permalinks/">Documentation on Using Permalinks</a>' ) . '</p>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __( '<a href="https://wordpress.org/support/article/settings-permalinks-screen/">Documentation on Permalinks Settings</a>' ) . '</p>' .
+ '<p>' . __( '<a href="https://wordpress.org/support/article/using-permalinks/">Documentation on Using Permalinks</a>' ) . '</p>';
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $is_nginx ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $help_sidebar_content .= '<p>' . __( '<a href="https://wordpress.org/support/article/nginx/">Documentation on Nginx configuration</a>.' ) . '</p>';
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -73,10 +73,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $iis7_permalinks = iis7_supports_permalinks();
</span><span class="cx" style="display: block; padding: 0 10px"> $permalink_structure = get_option( 'permalink_structure' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$prefix = '';
-$blog_prefix = '';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$index_php_prefix = '';
+$blog_prefix = '';
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! got_url_rewrite() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $prefix = '/index.php';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $index_php_prefix = '/index.php';
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /*
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -85,7 +86,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * network. If the `permalink_structure` option has been changed to remove this
</span><span class="cx" style="display: block; padding: 0 10px"> * base prefix, WordPress core can no longer account for the possible collision.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( is_multisite() && ! is_subdomain_install() && is_main_site() && 0 === strpos( $permalink_structure, '/blog/' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( is_multisite() && ! is_subdomain_install() && is_main_site()
+ && 0 === strpos( $permalink_structure, '/blog/' )
+) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $blog_prefix = '/blog';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -107,8 +110,9 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! empty( $permalink_structure ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $permalink_structure = preg_replace( '#/+#', '/', '/' . str_replace( '#', '', $permalink_structure ) );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( $prefix && $blog_prefix ) {
- $permalink_structure = $prefix . preg_replace( '#^/?index\.php#', '', $permalink_structure );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ if ( $index_php_prefix && $blog_prefix ) {
+ $permalink_structure = $index_php_prefix . preg_replace( '#^/?index\.php#', '', $permalink_structure );
</ins><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $permalink_structure = $blog_prefix . $permalink_structure;
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -143,7 +147,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $iis7_permalinks ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( ! file_exists( $home_path . 'web.config' ) && win_is_writable( $home_path ) ) || win_is_writable( $home_path . 'web.config' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( ! file_exists( $home_path . 'web.config' )
+ && win_is_writable( $home_path ) ) || win_is_writable( $home_path . 'web.config' )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $writable = true;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $writable = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -151,7 +157,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( $is_nginx ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $writable = false;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- if ( ( ! file_exists( $home_path . '.htaccess' ) && is_writable( $home_path ) ) || is_writable( $home_path . '.htaccess' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ if ( ( ! file_exists( $home_path . '.htaccess' )
+ && is_writable( $home_path ) ) || is_writable( $home_path . '.htaccess' )
+ ) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $writable = true;
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $writable = false;
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -211,172 +219,214 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <form name="form" action="options-permalink.php" method="post">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_nonce_field( 'update-permalink' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <p>
- <?php
- printf(
- /* translators: %s: Documentation URL. */
- __( '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="%s">number of tags are available</a>, and here are some examples to get you started.' ),
- __( 'https://wordpress.org/support/article/using-permalinks/' )
- );
- ?>
- </p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<p>
+<?php
+printf(
+ /* translators: %s: Documentation URL. */
+ __( '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="%s">number of tags are available</a>, and here are some examples to get you started.' ),
+ __( 'https://wordpress.org/support/article/using-permalinks/' )
+);
+?>
+</p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-if ( is_multisite() && ! is_subdomain_install() && is_main_site() && 0 === strpos( $permalink_structure, '/blog/' ) ) {
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+if ( is_multisite() && ! is_subdomain_install() && is_main_site()
+ && 0 === strpos( $permalink_structure, '/blog/' )
+) {
</ins><span class="cx" style="display: block; padding: 0 10px"> $permalink_structure = preg_replace( '|^/?blog|', '', $permalink_structure );
</span><span class="cx" style="display: block; padding: 0 10px"> $category_base = preg_replace( '|^/?blog|', '', $category_base );
</span><span class="cx" style="display: block; padding: 0 10px"> $tag_base = preg_replace( '|^/?blog|', '', $tag_base );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$structures = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$default_structures = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 0 => '',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 1 => $prefix . '/%year%/%monthnum%/%day%/%postname%/',
- 2 => $prefix . '/%year%/%monthnum%/%postname%/',
- 3 => $prefix . '/' . _x( 'archives', 'sample permalink base' ) . '/%post_id%',
- 4 => $prefix . '/%postname%/',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 1 => $index_php_prefix . '/%year%/%monthnum%/%day%/%postname%/',
+ 2 => $index_php_prefix . '/%year%/%monthnum%/%postname%/',
+ 3 => $index_php_prefix . '/' . _x( 'archives', 'sample permalink base' ) . '/%post_id%',
+ 4 => $index_php_prefix . '/%postname%/',
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$inputs = array(
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$url_base = get_option( 'home' ) . $blog_prefix . $index_php_prefix;
+
+$default_structure_inputs = array(
</ins><span class="cx" style="display: block; padding: 0 10px"> 0 => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'plain',
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Plain' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'example' => get_option( 'home' ) . '/?p=123',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'value' => $structures[0],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'value' => $default_structures[0],
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 1 => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'day-name',
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Day and name' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'example' => get_option( 'home' ) . $blog_prefix . $prefix . '/' . gmdate( 'Y' ) . '/' . gmdate( 'm' ) . '/' . gmdate( 'd' ) . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/',
- 'value' => $structures[1],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'example' => $url_base . '/' . gmdate( 'Y/m/d' ) . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/',
+ 'value' => $default_structures[1],
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 2 => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'month-name',
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Month and name' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'example' => get_option( 'home' ) . $blog_prefix . $prefix . '/' . gmdate( 'Y' ) . '/' . gmdate( 'm' ) . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/',
- 'value' => $structures[2],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'example' => $url_base . '/' . gmdate( 'Y/m' ) . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/',
+ 'value' => $default_structures[2],
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 3 => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'day-numeric',
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Numeric' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'example' => get_option( 'home' ) . $blog_prefix . $prefix . '/' . _x( 'archives', 'sample permalink base' ) . '/123',
- 'value' => $structures[3],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'example' => $url_base . '/' . _x( 'archives', 'sample permalink base' ) . '/123',
+ 'value' => $default_structures[3],
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> 4 => array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'id' => 'post-name',
</span><span class="cx" style="display: block; padding: 0 10px"> 'label' => __( 'Post name' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 'example' => get_option( 'home' ) . $blog_prefix . $prefix . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/',
- 'value' => $structures[4],
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'example' => $url_base . '/' . _x( 'sample-post', 'sample permalink structure' ) . '/',
+ 'value' => $default_structures[4],
</ins><span class="cx" style="display: block; padding: 0 10px"> ),
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+$available_tags = array(
+ /* translators: %s: Permalink structure tag. */
+ 'year' => __( '%s (The year of the post, four digits, for example 2004.)' ),
+ /* translators: %s: Permalink structure tag. */
+ 'monthnum' => __( '%s (Month of the year, for example 05.)' ),
+ /* translators: %s: Permalink structure tag. */
+ 'day' => __( '%s (Day of the month, for example 28.)' ),
+ /* translators: %s: Permalink structure tag. */
+ 'hour' => __( '%s (Hour of the day, for example 15.)' ),
+ /* translators: %s: Permalink structure tag. */
+ 'minute' => __( '%s (Minute of the hour, for example 43.)' ),
+ /* translators: %s: Permalink structure tag. */
+ 'second' => __( '%s (Second of the minute, for example 33.)' ),
+ /* translators: %s: Permalink structure tag. */
+ 'post_id' => __( '%s (The unique ID of the post, for example 423.)' ),
+ /* translators: %s: Permalink structure tag. */
+ 'postname' => __( '%s (The sanitized post title (slug).)' ),
+ /* translators: %s: Permalink structure tag. */
+ 'category' => __( '%s (Category slug. Nested sub-categories appear as nested directories in the URL.)' ),
+ /* translators: %s: Permalink structure tag. */
+ 'author' => __( '%s (A sanitized version of the author name.)' ),
+);
+
+/**
+ * Filters the list of available permalink structure tags on the Permalinks settings page.
+ *
+ * @since 4.9.0
+ *
+ * @param string[] $available_tags An array of key => value pairs of available permalink structure tags.
+ */
+$available_tags = apply_filters( 'available_permalink_structure_tags', $available_tags );
+
+/* translators: %s: Permalink structure tag. */
+$tag_added = __( '%s added to permalink structure' );
+
+/* translators: %s: Permalink structure tag. */
+$tag_already_used = __( '%s (already used in permalink structure)' );
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <h2 class="title"><?php _e( 'Common Settings' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table permalink-structure" role="presentation">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <tbody>
- <tr>
- <th scope="row"><?php _e( 'Permalink structure' ); ?></th>
- <td>
- <fieldset class="structure-selection">
- <legend class="screen-reader-text"><?php _e( 'Permalink structure' ); ?></legend>
- <?php
- foreach ( $inputs as $structure_id => $structure_values ) {
- $input_markup = '<div class="row">';
- $input_markup .= '<input id="permalink-input-' . $structure_values['id'] . '" name="selection" aria-describedby="permalink-' . $structure_values['id'] . '" type="radio" value="' . $structure_values['value'] . '" ' . checked( $structure_values['value'], $permalink_structure, false ) . ' />';
- $input_markup .= '<div><label for="permalink-input-' . $structure_values['id'] . '">' . $structure_values['label'] . '</label>';
- $input_markup .= '<p><code id="permalink-' . $structure_values['id'] . '">' . $structure_values['example'] . '</code></p>';
- $input_markup .= '</div>';
- $input_markup .= '</div>';
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<tbody>
+<tr>
+ <th scope="row"><?php _e( 'Permalink structure' ); ?></th>
+ <td>
+ <fieldset class="structure-selection">
+ <legend class="screen-reader-text"><?php _e( 'Permalink structure' ); ?></legend>
+ <?php foreach ( $default_structure_inputs as $input ) : ?>
+ <div class="row">
+ <input id="permalink-input-<?php echo $input['id']; ?>"
+ name="selection" aria-describedby="permalink-<?php echo $input['id']; ?>"
+ type="radio" value="<?php echo esc_attr( $input['value'] ); ?>"
+ <?php checked( $input['value'], $permalink_structure ); ?>
+ />
+ <div>
+ <label for="permalink-input-<?php echo $input['id']; ?>"><?php echo $input['label']; ?></label>
+ <p>
+ <code id="permalink-<?php echo $input['id']; ?>"><?php echo $input['example']; ?></code>
+ </p>
+ </div>
+ </div><!-- .row -->
+ <?php endforeach; ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- echo $input_markup;
- }
- ?>
- <div class="row">
- <input id="custom_selection" name="selection" type="radio" value="custom" <?php checked( ! in_array( $permalink_structure, $structures, true ) ); ?> /><div><label for="custom_selection"><?php _e( 'Custom Structure' ); ?></label>
- <p><label for="permalink_structure" class="screen-reader-text"><?php _e( 'Customize permalink structure by selecting available tags' ); ?></label><span class="code"><code id="permalink-custom"><?php echo get_option( 'home' ) . $blog_prefix; ?></code><input name="permalink_structure" id="permalink_structure" type="text" value="<?php echo esc_attr( $permalink_structure ); ?>" aria-describedby="permalink-custom" class="regular-text code" /></span></p>
- <div class="available-structure-tags hide-if-no-js">
- <div id="custom_selection_updated" aria-live="assertive" class="screen-reader-text"></div>
- <?php
- $available_tags = array(
- /* translators: %s: Permalink structure tag. */
- 'year' => __( '%s (The year of the post, four digits, for example 2004.)' ),
- /* translators: %s: Permalink structure tag. */
- 'monthnum' => __( '%s (Month of the year, for example 05.)' ),
- /* translators: %s: Permalink structure tag. */
- 'day' => __( '%s (Day of the month, for example 28.)' ),
- /* translators: %s: Permalink structure tag. */
- 'hour' => __( '%s (Hour of the day, for example 15.)' ),
- /* translators: %s: Permalink structure tag. */
- 'minute' => __( '%s (Minute of the hour, for example 43.)' ),
- /* translators: %s: Permalink structure tag. */
- 'second' => __( '%s (Second of the minute, for example 33.)' ),
- /* translators: %s: Permalink structure tag. */
- 'post_id' => __( '%s (The unique ID of the post, for example 423.)' ),
- /* translators: %s: Permalink structure tag. */
- 'postname' => __( '%s (The sanitized post title (slug).)' ),
- /* translators: %s: Permalink structure tag. */
- 'category' => __( '%s (Category slug. Nested sub-categories appear as nested directories in the URL.)' ),
- /* translators: %s: Permalink structure tag. */
- 'author' => __( '%s (A sanitized version of the author name.)' ),
- );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="row">
+ <input id="custom_selection"
+ name="selection" type="radio" value="custom"
+ <?php checked( ! in_array( $permalink_structure, $default_structures, true ) ); ?>
+ />
+ <div>
+ <label for="custom_selection"><?php _e( 'Custom Structure' ); ?></label>
+ <p>
+ <label for="permalink_structure" class="screen-reader-text">
+ <?php _e( 'Customize permalink structure by selecting available tags' ); ?>
+ </label>
+ <span class="code">
+ <code id="permalink-custom"><?php echo $url_base; ?></code>
+ <input name="permalink_structure" id="permalink_structure"
+ type="text" value="<?php echo esc_attr( $permalink_structure ); ?>"
+ aria-describedby="permalink-custom" class="regular-text code"
+ />
+ </span>
+ </p>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /**
- * Filters the list of available permalink structure tags on the Permalinks settings page.
- *
- * @since 4.9.0
- *
- * @param string[] $available_tags An array of key => value pairs of available permalink structure tags.
- */
- $available_tags = apply_filters( 'available_permalink_structure_tags', $available_tags );
-
- /* translators: %s: Permalink structure tag. */
- $structure_tag_added = __( '%s added to permalink structure' );
-
- /* translators: %s: Permalink structure tag. */
- $structure_tag_already_used = __( '%s (already used in permalink structure)' );
-
- if ( ! empty( $available_tags ) ) :
- ?>
- <fieldset>
- <legend><?php _e( 'Available tags:' ); ?></legend>
- <ul role="list">
- <?php foreach ( $available_tags as $tag => $explanation ) : ?>
- <li>
- <button type="button"
- class="button button-secondary"
- aria-label="<?php echo esc_attr( sprintf( $explanation, $tag ) ); ?>"
- data-added="<?php echo esc_attr( sprintf( $structure_tag_added, $tag ) ); ?>"
- data-used="<?php echo esc_attr( sprintf( $structure_tag_already_used, $tag ) ); ?>">
- <?php echo '%' . $tag . '%'; ?>
- </button>
- </li>
- <?php endforeach; ?>
- </ul>
- </fieldset>
- <?php endif; ?>
- </div>
- </div>
- </div>
- </fieldset>
- </td>
- </tr>
- </tbody>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <div class="available-structure-tags hide-if-no-js">
+ <div id="custom_selection_updated" aria-live="assertive" class="screen-reader-text"></div>
+ <?php if ( ! empty( $available_tags ) ) : ?>
+ <fieldset>
+ <legend><?php _e( 'Available tags:' ); ?></legend>
+ <ul role="list">
+ <?php foreach ( $available_tags as $tag => $explanation ) : ?>
+ <li>
+ <button type="button"
+ class="button button-secondary"
+ aria-label="<?php echo esc_attr( sprintf( $explanation, $tag ) ); ?>"
+ data-added="<?php echo esc_attr( sprintf( $tag_added, $tag ) ); ?>"
+ data-used="<?php echo esc_attr( sprintf( $tag_already_used, $tag ) ); ?>">
+ <?php echo '%' . $tag . '%'; ?>
+ </button>
+ </li>
+ <?php endforeach; ?>
+ </ul>
+ </fieldset>
+ <?php endif; ?>
+ </div><!-- .available-structure-tags -->
+ </div>
+ </div><!-- .row -->
+ </fieldset><!-- .structure-selection -->
+ </td>
+</tr>
+</tbody>
</ins><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <h2 class="title"><?php _e( 'Optional' ); ?></h2>
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-/* translators: %s: Placeholder that must come at the start of the URL. */
-printf( __( 'If you like, you may enter custom structures for your category and tag URLs here. For example, using <code>topics</code> as your category base would make your category links like <code>%s/topics/uncategorized/</code>. If you leave these blank the defaults will be used.' ), get_option( 'home' ) . $blog_prefix . $prefix );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+printf(
+ /* translators: %s: Placeholder that must come at the start of the URL. */
+ __( 'If you like, you may enter custom structures for your category and tag URLs here. For example, using <code>topics</code> as your category base would make your category links like <code>%s/topics/uncategorized/</code>. If you leave these blank the defaults will be used.' ),
+ $url_base
+);
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </p>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <table class="form-table" role="presentation">
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th><label for="category_base"><?php /* translators: Prefix for category permalinks. */ _e( 'Category base' ); ?></label></th>
- <td><?php echo $blog_prefix; ?> <input name="category_base" id="category_base" type="text" value="<?php echo esc_attr( $category_base ); ?>" class="regular-text code" /></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th>
+ <label for="category_base">
+ <?php /* translators: Prefix for category permalinks. */ _e( 'Category base' ); ?>
+ </label>
+ </th>
+ <td>
+ <?php echo $blog_prefix; ?>
+ <input name="category_base" id="category_base" type="text"
+ value="<?php echo esc_attr( $category_base ); ?>" class="regular-text code"
+ />
+ </td>
</ins><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- <th><label for="tag_base"><?php _e( 'Tag base' ); ?></label></th>
- <td><?php echo $blog_prefix; ?> <input name="tag_base" id="tag_base" type="text" value="<?php echo esc_attr( $tag_base ); ?>" class="regular-text code" /></td>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <th>
+ <label for="tag_base"><?php _e( 'Tag base' ); ?></label>
+ </th>
+ <td>
+ <?php echo $blog_prefix; ?>
+ <input name="tag_base" id="tag_base" type="text"
+ value="<?php echo esc_attr( $tag_base ); ?>" class="regular-text code"
+ />
+ </td>
</ins><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php do_settings_fields( 'permalink', 'optional' ); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </table>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -385,13 +435,14 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php submit_button(); ?>
</span><span class="cx" style="display: block; padding: 0 10px"> </form>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php if ( ! is_multisite() ) { ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+<?php if ( ! is_multisite() ) : ?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $iis7_permalinks ) :
</span><span class="cx" style="display: block; padding: 0 10px"> if ( isset( $_POST['submit'] ) && $permalink_structure && ! $using_index_permalinks && ! $writable ) :
</span><span class="cx" style="display: block; padding: 0 10px"> if ( file_exists( $home_path . 'web.config' ) ) :
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<p id="iis-description-a">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ <p id="iis-description-a">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: 1: web.config, 2: Documentation URL, 3: Ctrl + A, 4: ⌘ + A, 5: Element code. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -403,12 +454,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>/<configuration>/<system.webServer>/<rewrite>/<rules></code>'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-</p>
-<form action="options-permalink.php" method="post">
- <?php wp_nonce_field( 'update-permalink' ); ?>
- <p><label for="rules"><?php _e( 'Rewrite rules:' ); ?></label><br /><textarea rows="9" class="large-text readonly" name="rules" id="rules" readonly="readonly" aria-describedby="iis-description-a"><?php echo esc_textarea( $wp_rewrite->iis7_url_rewrite_rules() ); ?></textarea></p>
-</form>
-<p>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </p>
+ <form action="options-permalink.php" method="post">
+ <?php wp_nonce_field( 'update-permalink' ); ?>
+ <p>
+ <label for="rules"><?php _e( 'Rewrite rules:' ); ?></label><br />
+ <textarea rows="9" class="large-text readonly"
+ name="rules" id="rules" readonly="readonly"
+ aria-describedby="iis-description-a"
+ ><?php echo esc_textarea( $wp_rewrite->iis7_url_rewrite_rules() ); ?></textarea>
+ </p>
+ </form>
+ <p>
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: %s: web.config */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -416,59 +473,69 @@
</span><span class="cx" style="display: block; padding: 0 10px"> '<code>web.config</code>'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-</p>
- <?php else : ?>
-<p id="iis-description-b">
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </p>
+ <?php else : ?>
+ <p id="iis-description-b">
+ <?php
+ printf(
+ /* translators: 1: Documentation URL, 2: web.config, 3: Ctrl + A, 4: ⌘ + A */
+ __( '<strong>Error:</strong> The root directory of your site is not <a href="%1$s">writable</a>, so creating a file automatically was not possible. This is the URL rewrite rule you should have in your %2$s file. Create a new file called %2$s in the root directory of your site. Click in the field and press %3$s (or %4$s on Mac) to select all. Then insert this code into the %2$s file.' ),
+ __( 'https://wordpress.org/support/article/changing-file-permissions/' ),
+ '<code>web.config</code>',
+ '<kbd>Ctrl + A</kbd>',
+ '<kbd>⌘ + A</kbd>'
+ );
+ ?>
+ </p>
+ <form action="options-permalink.php" method="post">
+ <?php wp_nonce_field( 'update-permalink' ); ?>
+ <p>
+ <label for="rules"><?php _e( 'Rewrite rules:' ); ?></label><br />
+ <textarea rows="18" class="large-text readonly"
+ name="rules" id="rules" readonly="readonly"
+ aria-describedby="iis-description-b"
+ ><?php echo esc_textarea( $wp_rewrite->iis7_url_rewrite_rules( true ) ); ?></textarea>
+ </p>
+ </form>
+ <p>
+ <?php
+ printf(
+ /* translators: %s: web.config */
+ __( 'If you temporarily make your site’s root directory writable to generate the %s file automatically, do not forget to revert the permissions after the file has been created.' ),
+ '<code>web.config</code>'
+ );
+ ?>
+ </p>
+ <?php endif; // End if 'web.config' exists. ?>
+ <?php endif; // End if $_POST['submit'] && ! $writable. ?>
+ <?php else : ?>
+ <?php if ( $permalink_structure && ! $using_index_permalinks && ! $writable && $htaccess_update_required ) : ?>
+ <p id="htaccess-description">
</ins><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Documentation URL, 2: web.config, 3: Ctrl + A, 4: ⌘ + A */
- __( '<strong>Error:</strong> The root directory of your site is not <a href="%1$s">writable</a>, so creating a file automatically was not possible. This is the URL rewrite rule you should have in your %2$s file. Create a new file called %2$s in the root directory of your site. Click in the field and press %3$s (or %4$s on Mac) to select all. Then insert this code into the %2$s file.' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: .htaccess, 2: Documentation URL, 3: Ctrl + A, 4: ⌘ + A */
+ __( '<strong>Error:</strong> Your %1$s file is not <a href="%2$s">writable</a>, so updating it automatically was not possible. These are the mod_rewrite rules you should have in your %1$s file. Click in the field and press %3$s (or %4$s on Mac) to select all.' ),
+ '<code>.htaccess</code>',
</ins><span class="cx" style="display: block; padding: 0 10px"> __( 'https://wordpress.org/support/article/changing-file-permissions/' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<code>web.config</code>',
</del><span class="cx" style="display: block; padding: 0 10px"> '<kbd>Ctrl + A</kbd>',
</span><span class="cx" style="display: block; padding: 0 10px"> '<kbd>⌘ + A</kbd>'
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-</p>
-<form action="options-permalink.php" method="post">
- <?php wp_nonce_field( 'update-permalink' ); ?>
- <p><label for="rules"><?php _e( 'Rewrite rules:' ); ?></label><br /><textarea rows="18" class="large-text readonly" name="rules" id="rules" readonly="readonly" aria-describedby="iis-description-b"><?php echo esc_textarea( $wp_rewrite->iis7_url_rewrite_rules( true ) ); ?></textarea></p>
-</form>
-<p>
- <?php
- printf(
- /* translators: %s: web.config */
- __( 'If you temporarily make your site’s root directory writable to generate the %s file automatically, do not forget to revert the permissions after the file has been created.' ),
- '<code>web.config</code>'
- );
- ?>
-</p>
- <?php endif; ?>
- <?php endif; ?>
- <?php
-else :
- if ( $permalink_structure && ! $using_index_permalinks && ! $writable && $htaccess_update_required ) :
- ?>
-<p id="htaccess-description">
- <?php
- printf(
- /* translators: 1: .htaccess, 2: Documentation URL, 3: Ctrl + A, 4: ⌘ + A */
- __( '<strong>Error:</strong> Your %1$s file is not <a href="%2$s">writable</a>, so updating it automatically was not possible. These are the mod_rewrite rules you should have in your %1$s file. Click in the field and press %3$s (or %4$s on Mac) to select all.' ),
- '<code>.htaccess</code>',
- __( 'https://wordpress.org/support/article/changing-file-permissions/' ),
- '<kbd>Ctrl + A</kbd>',
- '<kbd>⌘ + A</kbd>'
- );
- ?>
-</p>
-<form action="options-permalink.php" method="post">
- <?php wp_nonce_field( 'update-permalink' ); ?>
- <p><label for="rules"><?php _e( 'Rewrite rules:' ); ?></label><br /><textarea rows="8" class="large-text readonly" name="rules" id="rules" readonly="readonly" aria-describedby="htaccess-description"><?php echo esc_textarea( $wp_rewrite->mod_rewrite_rules() ); ?></textarea></p>
-</form>
- <?php endif; ?>
-<?php endif; ?>
-<?php } // End if ! is_multisite(). ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ </p>
+ <form action="options-permalink.php" method="post">
+ <?php wp_nonce_field( 'update-permalink' ); ?>
+ <p>
+ <label for="rules"><?php _e( 'Rewrite rules:' ); ?></label><br />
+ <textarea rows="8" class="large-text readonly"
+ name="rules" id="rules" readonly="readonly"
+ aria-describedby="htaccess-description"
+ ><?php echo esc_textarea( $wp_rewrite->mod_rewrite_rules() ); ?></textarea>
+ </p>
+ </form>
+ <?php endif; // End if ! $writable && $htaccess_update_required. ?>
+ <?php endif; // End if $iis7_permalinks. ?>
+<?php endif; // End if ! is_multisite(). ?>
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-</div>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+</div><!-- .wrap -->
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php require_once ABSPATH . 'wp-admin/admin-footer.php'; ?>
</span></span></pre>
</div>
</div>
</body>
</html>