HostForge-Systems/wordpress
Template
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Date/Time: Revert [60942].

Browse Source 
The changes in [60942] aimed to add an indicator next to the default date and time formats for the site’s locale in General Settings. However, the changes do not take into account the fact that a user may have a different language than the site’s default selected as their preference.

Props swissspidy, johnbillion, SergeyBiryukov, pbearne, desrosj, wildworks.
See #64102.
Built from https://develop.svn.wordpress.org/trunk@61193


git-svn-id: http://core.svn.wordpress.org/trunk@60529 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
desrosj
2025-11-10 20:42:28 +00:00
parent b058f24638
commit 7adbca1ca9
2 changed files with 3 additions and 21 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
wp-admin/options-general.php
View File

@@ -480,20 +480,11 @@ if ( empty( $tzstring ) ) { // Create a UTC+- zone if no timezone string exists.
foreach ( $date_formats as $format ) {
echo "\t<label><input type='radio' name='date_format' value='" . esc_attr( $format ) . "'";
if ( get_option( 'date_format' ) === $format ) { // checked() uses "==" rather than "===".
echo " checked='checked'";
$custom = false;
}
echo ' /> <span class="date-time-text format-i18n">' . date_i18n( $format ) . '</span>' .
'<code>' . esc_html( $format ) . '</code>';
if ( __( 'F j, Y' ) === $format ) {
echo ' ' . __( '(Site language default)' );
}
echo "</label><br />\n";
echo ' /> <span class="date-time-text format-i18n">' . date_i18n( $format ) . '</span><code>' . esc_html( $format ) . "</code></label><br />\n";
}
echo '<label><input type="radio" name="date_format" id="date_format_custom_radio" value="\c\u\s\t\o\m"';
@@ -534,20 +525,11 @@ foreach ( $date_formats as $format ) {
foreach ( $time_formats as $format ) {
echo "\t<label><input type='radio' name='time_format' value='" . esc_attr( $format ) . "'";
if ( get_option( 'time_format' ) === $format ) { // checked() uses "==" rather than "===".
echo " checked='checked'";
$custom = false;
}
echo ' /> <span class="date-time-text format-i18n">' . date_i18n( $format ) . '</span>' .
'<code>' . esc_html( $format ) . '</code>';
if ( __( 'g:i a' ) === $format ) {
echo ' ' . __( '(Site language default)' );
}
echo "</label><br />\n";
echo ' /> <span class="date-time-text format-i18n">' . date_i18n( $format ) . '</span><code>' . esc_html( $format ) . "</code></label><br />\n";
}
echo '<label><input type="radio" name="time_format" id="time_format_custom_radio" value="\c\u\s\t\o\m"';

2
wp-includes/version.php
View File

@@ -16,7 +16,7 @@
*
* @global string $wp_version
*/
$wp_version = '6.9-beta4-61192';
$wp_version = '6.9-beta4-61193';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.