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

Permalinks: Add labels for permalink configuration fields. 

If the current server configuration doesn't allow WordPress to edit permalink settings, the textarea with new rules to use was not labeled. Add labels and aria-describedby pointing to the field description.
 
Props sabernhardt
Fixes #53142.
Built from https://develop.svn.wordpress.org/trunk@50830


git-svn-id: http://core.svn.wordpress.org/trunk@50439 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
joedolson 2021-05-07 23:51:04 +00:00
parent 9b6710c43c
commit 34e71f3d94
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

@ -357,7 +357,7 @@ printf( __( 'If you like, you may enter custom structures for your category and
if ( isset( $_POST['submit'] ) && $permalink_structure && ! $using_index_permalinks && ! $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> <p id="iis-description-a">
<?php <?php
printf( printf(
/* translators: 1: web.config, 2: Documentation URL, 3: CTRL + a, 4: Element code. */ /* translators: 1: web.config, 2: Documentation URL, 3: CTRL + a, 4: Element code. */
@ -371,7 +371,7 @@ printf( __( 'If you like, you may enter custom structures for your category and
</p> </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' ); ?>
<p><textarea rows="9" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->iis7_url_rewrite_rules() ); ?></textarea></p> <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> </form>
<p> <p>
<?php <?php
@ -383,7 +383,7 @@ printf( __( 'If you like, you may enter custom structures for your category and
?> ?>
</p> </p>
<?php else : ?> <?php else : ?>
<p> <p id="iis-description-b">
<?php <?php
printf( printf(
/* translators: 1: Documentation URL, 2: web.config, 3: CTRL + a */ /* translators: 1: Documentation URL, 2: web.config, 3: CTRL + a */
@ -396,7 +396,7 @@ printf( __( 'If you like, you may enter custom structures for your category and
</p> </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' ); ?>
<p><textarea rows="18" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->iis7_url_rewrite_rules( true ) ); ?></textarea></p> <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> </form>
<p> <p>
<?php <?php
@ -415,7 +415,7 @@ printf( __( 'If you like, you may enter custom structures for your category and
else : else :
if ( $permalink_structure && ! $using_index_permalinks && ! $writable && $htaccess_update_required ) : if ( $permalink_structure && ! $using_index_permalinks && ! $writable && $htaccess_update_required ) :
?> ?>
<p> <p id="htaccess-description">
<?php <?php
printf( printf(
/* translators: 1: .htaccess, 2: Documentation URL, 3: CTRL + a */ /* translators: 1: .htaccess, 2: Documentation URL, 3: CTRL + a */
@ -428,7 +428,7 @@ else :
</p> </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' ); ?>
<p><textarea rows="6" class="large-text readonly" name="rules" id="rules" readonly="readonly"><?php echo esc_textarea( $wp_rewrite->mod_rewrite_rules() ); ?></textarea></p> <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> </form>
<?php endif; ?> <?php endif; ?>
<?php endif; ?> <?php endif; ?>

2
wp-includes/version.php
View File

@ -13,7 +13,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '5.8-alpha-50829'; $wp_version = '5.8-alpha-50830';
/** /**
* 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.