diff -r c7c34916027a -r 177826044cd9 wp/wp-admin/options-general.php
--- a/wp/wp-admin/options-general.php	Mon Oct 14 18:06:33 2019 +0200
+++ b/wp/wp-admin/options-general.php	Mon Oct 14 18:28:13 2019 +0200
@@ -12,38 +12,41 @@
 /** WordPress Translation Installation API */
 require_once( ABSPATH . 'wp-admin/includes/translation-install.php' );
 
-if ( ! current_user_can( 'manage_options' ) )
+if ( ! current_user_can( 'manage_options' ) ) {
 	wp_die( __( 'Sorry, you are not allowed to manage options for this site.' ) );
+}
 
-$title = __('General Settings');
+$title       = __( 'General Settings' );
 $parent_file = 'options-general.php';
 /* translators: date and time format for exact current time, mainly about timezones, see https://secure.php.net/date */
-$timezone_format = _x('Y-m-d H:i:s', 'timezone date format');
+$timezone_format = _x( 'Y-m-d H:i:s', 'timezone date format' );
 
-add_action('admin_head', 'options_general_add_js');
+add_action( 'admin_head', 'options_general_add_js' );
 
-$options_help = '<p>' . __('The fields on this screen determine some of the basics of your site setup.') . '</p>' .
-	'<p>' . __('Most themes display the site title at the top of every page, in the title bar of the browser, and as the identifying name for syndicated feeds. The tagline is also displayed by many themes.') . '</p>';
+$options_help = '<p>' . __( 'The fields on this screen determine some of the basics of your site setup.' ) . '</p>' .
+	'<p>' . __( 'Most themes display the site title at the top of every page, in the title bar of the browser, and as the identifying name for syndicated feeds. The tagline is also displayed by many themes.' ) . '</p>';
 
 if ( ! is_multisite() ) {
-	$options_help .= '<p>' . __('The WordPress URL and the Site URL can be the same (example.com) or different; for example, having the WordPress core files (example.com/wordpress) in a subdirectory instead of the root directory.') . '</p>' .
-		'<p>' . __('If you want site visitors to be able to register themselves, as opposed to by the site administrator, check the membership box. A default user role can be set for all new users, whether self-registered or registered by the site admin.') . '</p>';
+	$options_help .= '<p>' . __( 'The WordPress URL and the Site URL can be the same (example.com) or different; for example, having the WordPress core files (example.com/wordpress) in a subdirectory instead of the root directory.' ) . '</p>' .
+		'<p>' . __( 'If you want site visitors to be able to register themselves, as opposed to by the site administrator, check the membership box. A default user role can be set for all new users, whether self-registered or registered by the site admin.' ) . '</p>';
 }
 
 $options_help .= '<p>' . __( 'You can set the language, and the translation files will be automatically downloaded and installed (available if your filesystem is writable).' ) . '</p>' .
 	'<p>' . __( 'UTC means Coordinated Universal Time.' ) . '</p>' .
 	'<p>' . __( 'You must click the Save Changes button at the bottom of the screen for new settings to take effect.' ) . '</p>';
 
-get_current_screen()->add_help_tab( array(
-	'id'      => 'overview',
-	'title'   => __('Overview'),
-	'content' => $options_help,
-) );
+get_current_screen()->add_help_tab(
+	array(
+		'id'      => 'overview',
+		'title'   => __( 'Overview' ),
+		'content' => $options_help,
+	)
+);
 
 get_current_screen()->set_help_sidebar(
-	'<p><strong>' . __('For more information:') . '</strong></p>' .
-	'<p>' . __('<a href="https://codex.wordpress.org/Settings_General_Screen">Documentation on General Settings</a>') . '</p>' .
-	'<p>' . __('<a href="https://wordpress.org/support/">Support Forums</a>') . '</p>'
+	'<p><strong>' . __( 'For more information:' ) . '</strong></p>' .
+	'<p>' . __( '<a href="https://codex.wordpress.org/Settings_General_Screen">Documentation on General Settings</a>' ) . '</p>' .
+	'<p>' . __( '<a href="https://wordpress.org/support/">Support</a>' ) . '</p>'
 );
 
 include( ABSPATH . 'wp-admin/admin-header.php' );
@@ -53,39 +56,50 @@
 <h1><?php echo esc_html( $title ); ?></h1>
 
 <form method="post" action="options.php" novalidate="novalidate">
-<?php settings_fields('general'); ?>
+<?php settings_fields( 'general' ); ?>
 
-<table class="form-table">
+<table class="form-table" role="presentation">
 
 <tr>
-<th scope="row"><label for="blogname"><?php _e('Site Title') ?></label></th>
-<td><input name="blogname" type="text" id="blogname" value="<?php form_option('blogname'); ?>" class="regular-text" /></td>
+<th scope="row"><label for="blogname"><?php _e( 'Site Title' ); ?></label></th>
+<td><input name="blogname" type="text" id="blogname" value="<?php form_option( 'blogname' ); ?>" class="regular-text" /></td>
 </tr>
 
 <tr>
-<th scope="row"><label for="blogdescription"><?php _e('Tagline') ?></label></th>
-<td><input name="blogdescription" type="text" id="blogdescription" aria-describedby="tagline-description" value="<?php form_option('blogdescription'); ?>" class="regular-text" />
-<p class="description" id="tagline-description"><?php _e( 'In a few words, explain what this site is about.' ) ?></p></td>
+<th scope="row"><label for="blogdescription"><?php _e( 'Tagline' ); ?></label></th>
+<td><input name="blogdescription" type="text" id="blogdescription" aria-describedby="tagline-description" value="<?php form_option( 'blogdescription' ); ?>" class="regular-text" />
+<p class="description" id="tagline-description"><?php _e( 'In a few words, explain what this site is about.' ); ?></p></td>
 </tr>
 
-<?php if ( !is_multisite() ) { ?>
+<?php
+if ( ! is_multisite() ) {
+	$wp_site_url_class = $wp_home_class = '';
+	if ( defined( 'WP_SITEURL' ) ) {
+		$wp_site_url_class = ' disabled';
+	}
+	if ( defined( 'WP_HOME' ) ) {
+		$wp_home_class = ' disabled';
+	}
+	?>
 
 <tr>
-<th scope="row"><label for="siteurl"><?php _e('WordPress Address (URL)') ?></label></th>
-<td><input name="siteurl" type="url" id="siteurl" value="<?php form_option( 'siteurl' ); ?>"<?php disabled( defined( 'WP_SITEURL' ) ); ?> class="regular-text code<?php if ( defined( 'WP_SITEURL' ) ) echo ' disabled' ?>" /></td>
+<th scope="row"><label for="siteurl"><?php _e( 'WordPress Address (URL)' ); ?></label></th>
+<td><input name="siteurl" type="url" id="siteurl" value="<?php form_option( 'siteurl' ); ?>"<?php disabled( defined( 'WP_SITEURL' ) ); ?> class="regular-text code<?php echo $wp_site_url_class; ?>" /></td>
 </tr>
 
 <tr>
-<th scope="row"><label for="home"><?php _e('Site Address (URL)') ?></label></th>
-<td><input name="home" type="url" id="home" aria-describedby="home-description" value="<?php form_option( 'home' ); ?>"<?php disabled( defined( 'WP_HOME' ) ); ?> class="regular-text code<?php if ( defined( 'WP_HOME' ) ) echo ' disabled' ?>" />
-<?php if ( ! defined( 'WP_HOME' ) ) : ?>
-<p class="description" id="home-description"><?php
-	printf(
-		/* translators: %s: Codex URL */
-		__( 'Enter the address here if you <a href="%s">want your site home page to be different from your WordPress installation directory</a>.' ),
-		__( 'https://codex.wordpress.org/Giving_WordPress_Its_Own_Directory' )
-	);
-?></p>
+<th scope="row"><label for="home"><?php _e( 'Site Address (URL)' ); ?></label></th>
+<td><input name="home" type="url" id="home" aria-describedby="home-description" value="<?php form_option( 'home' ); ?>"<?php disabled( defined( 'WP_HOME' ) ); ?> class="regular-text code<?php echo $wp_home_class; ?>" />
+	<?php if ( ! defined( 'WP_HOME' ) ) : ?>
+<p class="description" id="home-description">
+		<?php
+		printf(
+			/* translators: %s: Codex URL */
+			__( 'Enter the address here if you <a href="%s">want your site home page to be different from your WordPress installation directory</a>.' ),
+			__( 'https://codex.wordpress.org/Giving_WordPress_Its_Own_Directory' )
+		);
+		?>
+</p>
 <?php endif; ?>
 </td>
 </tr>
@@ -98,9 +112,11 @@
 <p class="description" id="new-admin-email-description"><?php _e( 'This address is used for admin purposes. If you change this we will send you an email at your new address to confirm it. <strong>The new address will not become active until confirmed.</strong>' ); ?></p>
 <?php
 $new_admin_email = get_option( 'new_admin_email' );
-if ( $new_admin_email && $new_admin_email != get_option( 'admin_email' ) ) : ?>
+if ( $new_admin_email && $new_admin_email != get_option( 'admin_email' ) ) :
+	?>
 	<div class="updated inline">
-	<p><?php
+	<p>
+	<?php
 		printf(
 			/* translators: %s: new admin email */
 			__( 'There is a pending change of the admin email to %s.' ),
@@ -111,7 +127,8 @@
 			esc_url( wp_nonce_url( admin_url( 'options.php?dismiss=new_admin_email' ), 'dismiss-' . get_current_blog_id() . '-new_admin_email' ) ),
 			__( 'Cancel' )
 		);
-	?></p>
+	?>
+	</p>
 	</div>
 <?php endif; ?>
 </td>
@@ -120,23 +137,24 @@
 <?php if ( ! is_multisite() ) { ?>
 
 <tr>
-<th scope="row"><?php _e('Membership') ?></th>
-<td> <fieldset><legend class="screen-reader-text"><span><?php _e('Membership') ?></span></legend><label for="users_can_register">
-<input name="users_can_register" type="checkbox" id="users_can_register" value="1" <?php checked('1', get_option('users_can_register')); ?> />
-<?php _e('Anyone can register') ?></label>
+<th scope="row"><?php _e( 'Membership' ); ?></th>
+<td> <fieldset><legend class="screen-reader-text"><span><?php _e( 'Membership' ); ?></span></legend><label for="users_can_register">
+<input name="users_can_register" type="checkbox" id="users_can_register" value="1" <?php checked( '1', get_option( 'users_can_register' ) ); ?> />
+	<?php _e( 'Anyone can register' ); ?></label>
 </fieldset></td>
 </tr>
 
 <tr>
-<th scope="row"><label for="default_role"><?php _e('New User Default Role') ?></label></th>
+<th scope="row"><label for="default_role"><?php _e( 'New User Default Role' ); ?></label></th>
 <td>
-<select name="default_role" id="default_role"><?php wp_dropdown_roles( get_option('default_role') ); ?></select>
+<select name="default_role" id="default_role"><?php wp_dropdown_roles( get_option( 'default_role' ) ); ?></select>
 </td>
 </tr>
 
-<?php }
+	<?php
+}
 
-$languages = get_available_languages();
+$languages    = get_available_languages();
 $translations = wp_get_available_translations();
 if ( ! is_multisite() && defined( 'WPLANG' ) && '' !== WPLANG && 'en_US' !== WPLANG && ! in_array( WPLANG, $languages ) ) {
 	$languages[] = WPLANG;
@@ -152,26 +170,20 @@
 				$locale = '';
 			}
 
-			wp_dropdown_languages( array(
-				'name'         => 'WPLANG',
-				'id'           => 'WPLANG',
-				'selected'     => $locale,
-				'languages'    => $languages,
-				'translations' => $translations,
-				'show_available_translations' => current_user_can( 'install_languages' ) && wp_can_install_language_pack(),
-			) );
+			wp_dropdown_languages(
+				array(
+					'name'                        => 'WPLANG',
+					'id'                          => 'WPLANG',
+					'selected'                    => $locale,
+					'languages'                   => $languages,
+					'translations'                => $translations,
+					'show_available_translations' => current_user_can( 'install_languages' ) && wp_can_install_language_pack(),
+				)
+			);
 
 			// Add note about deprecated WPLANG constant.
 			if ( defined( 'WPLANG' ) && ( '' !== WPLANG ) && $locale !== WPLANG ) {
-				if ( is_multisite() && current_user_can( 'manage_network_options' )
-					|| ! is_multisite() && current_user_can( 'manage_options' ) ) {
-					?>
-					<p class="description">
-						<strong><?php _e( 'Note:' ); ?></strong> <?php printf( __( 'The %s constant in your %s file is no longer needed.' ), '<code>WPLANG</code>', '<code>wp-config.php</code>' ); ?>
-					</p>
-					<?php
-				}
-				_deprecated_argument( 'define()', '4.0.0', sprintf( __( 'The %s constant in your %s file is no longer needed.' ), 'WPLANG', 'wp-config.php' ) );
+				_deprecated_argument( 'define()', '4.0.0', sprintf( __( 'The %1$s constant in your %2$s file is no longer needed.' ), 'WPLANG', 'wp-config.php' ) );
 			}
 			?>
 		</td>
@@ -181,27 +193,29 @@
 ?>
 <tr>
 <?php
-$current_offset = get_option('gmt_offset');
-$tzstring = get_option('timezone_string');
+$current_offset = get_option( 'gmt_offset' );
+$tzstring       = get_option( 'timezone_string' );
 
 $check_zone_info = true;
 
 // Remove old Etc mappings. Fallback to gmt_offset.
-if ( false !== strpos($tzstring,'Etc/GMT') )
+if ( false !== strpos( $tzstring, 'Etc/GMT' ) ) {
 	$tzstring = '';
+}
 
-if ( empty($tzstring) ) { // Create a UTC+- zone if no timezone string exists
+if ( empty( $tzstring ) ) { // Create a UTC+- zone if no timezone string exists
 	$check_zone_info = false;
-	if ( 0 == $current_offset )
+	if ( 0 == $current_offset ) {
 		$tzstring = 'UTC+0';
-	elseif ($current_offset < 0)
+	} elseif ( $current_offset < 0 ) {
 		$tzstring = 'UTC' . $current_offset;
-	else
+	} else {
 		$tzstring = 'UTC+' . $current_offset;
+	}
 }
 
 ?>
-<th scope="row"><label for="timezone_string"><?php _e('Timezone') ?></label></th>
+<th scope="row"><label for="timezone_string"><?php _e( 'Timezone' ); ?></label></th>
 <td>
 
 <select id="timezone_string" name="timezone_string" aria-describedby="timezone-description">
@@ -211,20 +225,26 @@
 <p class="description" id="timezone-description"><?php _e( 'Choose either a city in the same timezone as you or a UTC timezone offset.' ); ?></p>
 
 <p class="timezone-info">
-	<span id="utc-time"><?php
+	<span id="utc-time">
+	<?php
 		/* translators: 1: UTC abbreviation, 2: UTC time */
-		printf( __( 'Universal time (%1$s) is %2$s.' ),
+		printf(
+			__( 'Universal time (%1$s) is %2$s.' ),
 			'<abbr>' . __( 'UTC' ) . '</abbr>',
 			'<code>' . date_i18n( $timezone_format, false, true ) . '</code>'
 		);
-	?></span>
+		?>
+	</span>
 <?php if ( get_option( 'timezone_string' ) || ! empty( $current_offset ) ) : ?>
-	<span id="local-time"><?php
+	<span id="local-time">
+	<?php
 		/* translators: %s: local time */
-		printf( __( 'Local time is %s.' ),
+		printf(
+			__( 'Local time is %s.' ),
 			'<code>' . date_i18n( $timezone_format ) . '</code>'
 		);
-	?></span>
+	?>
+	</span>
 <?php endif; ?>
 </p>
 
@@ -233,25 +253,26 @@
 <span>
 	<?php
 	// Set TZ so localtime works.
-	date_default_timezone_set($tzstring);
-	$now = localtime(time(), true);
-	if ( $now['tm_isdst'] )
-		_e('This timezone is currently in daylight saving time.');
-	else
-		_e('This timezone is currently in standard time.');
+	date_default_timezone_set( $tzstring );
+	$now = localtime( time(), true );
+	if ( $now['tm_isdst'] ) {
+		_e( 'This timezone is currently in daylight saving time.' );
+	} else {
+		_e( 'This timezone is currently in standard time.' );
+	}
 	?>
 	<br />
 	<?php
 	$allowed_zones = timezone_identifiers_list();
 
-	if ( in_array( $tzstring, $allowed_zones) ) {
-		$found = false;
-		$date_time_zone_selected = new DateTimeZone($tzstring);
-		$tz_offset = timezone_offset_get($date_time_zone_selected, date_create());
-		$right_now = time();
-		foreach ( timezone_transitions_get($date_time_zone_selected) as $tr) {
+	if ( in_array( $tzstring, $allowed_zones ) ) {
+		$found                   = false;
+		$date_time_zone_selected = new DateTimeZone( $tzstring );
+		$tz_offset               = timezone_offset_get( $date_time_zone_selected, date_create() );
+		$right_now               = time();
+		foreach ( timezone_transitions_get( $date_time_zone_selected ) as $tr ) {
 			if ( $tr['ts'] > $right_now ) {
-			    $found = true;
+				$found = true;
 				break;
 			}
 		}
@@ -260,11 +281,12 @@
 			echo ' ';
 			$message = $tr['isdst'] ?
 				/* translators: %s: date and time  */
-				__( 'Daylight saving time begins on: %s.')  :
+				__( 'Daylight saving time begins on: %s.' ) :
 				/* translators: %s: date and time  */
 				__( 'Standard time begins on: %s.' );
 			// Add the difference between the current offset and the new offset to ts to get the correct transition time from date_i18n().
-			printf( $message,
+			printf(
+				$message,
 				'<code>' . date_i18n(
 					__( 'F j, Y' ) . ' ' . __( 'g:i a' ),
 					$tr['ts'] + ( $tz_offset - $tr['offset'] )
@@ -275,7 +297,7 @@
 		}
 	}
 	// Set back to UTC.
-	date_default_timezone_set('UTC');
+	date_default_timezone_set( 'UTC' );
 	?>
 	</span>
 </p>
@@ -284,30 +306,30 @@
 
 </tr>
 <tr>
-<th scope="row"><?php _e('Date Format') ?></th>
+<th scope="row"><?php _e( 'Date Format' ); ?></th>
 <td>
-	<fieldset><legend class="screen-reader-text"><span><?php _e('Date Format') ?></span></legend>
+	<fieldset><legend class="screen-reader-text"><span><?php _e( 'Date Format' ); ?></span></legend>
 <?php
 	/**
-	* Filters the default date formats.
-	*
-	* @since 2.7.0
-	* @since 4.0.0 Added ISO date standard YYYY-MM-DD format.
-	*
-	* @param array $default_date_formats Array of default date formats.
-	*/
+	 * Filters the default date formats.
+	 *
+	 * @since 2.7.0
+	 * @since 4.0.0 Added ISO date standard YYYY-MM-DD format.
+	 *
+	 * @param string[] $default_date_formats Array of default date formats.
+	 */
 	$date_formats = array_unique( apply_filters( 'date_formats', array( __( 'F j, Y' ), 'Y-m-d', 'm/d/Y', 'd/m/Y' ) ) );
 
 	$custom = true;
 
-	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></label><br />\n";
+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></label><br />\n";
+}
 
 	echo '<label><input type="radio" name="date_format" id="date_format_custom_radio" value="\c\u\s\t\o\m"';
 	checked( $custom );
@@ -322,29 +344,29 @@
 </td>
 </tr>
 <tr>
-<th scope="row"><?php _e('Time Format') ?></th>
+<th scope="row"><?php _e( 'Time Format' ); ?></th>
 <td>
-	<fieldset><legend class="screen-reader-text"><span><?php _e('Time Format') ?></span></legend>
+	<fieldset><legend class="screen-reader-text"><span><?php _e( 'Time Format' ); ?></span></legend>
 <?php
 	/**
-	* Filters the default time formats.
-	*
-	* @since 2.7.0
-	*
-	* @param array $default_time_formats Array of default time formats.
-	*/
+	 * Filters the default time formats.
+	 *
+	 * @since 2.7.0
+	 *
+	 * @param string[] $default_time_formats Array of default time formats.
+	 */
 	$time_formats = array_unique( apply_filters( 'time_formats', array( __( 'g:i a' ), 'g:i A', 'H:i' ) ) );
 
 	$custom = true;
 
-	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></label><br />\n";
+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></label><br />\n";
+}
 
 	echo '<label><input type="radio" name="time_format" id="time_format_custom_radio" value="\c\u\s\t\o\m"';
 	checked( $custom );
@@ -355,13 +377,13 @@
 		'<p><strong>' . __( 'Preview:' ) . '</strong> <span class="example">' . date_i18n( get_option( 'time_format' ) ) . '</span>' .
 		"<span class='spinner'></span>\n" . '</p>';
 
-	echo "\t<p class='date-time-doc'>" . __('<a href="https://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date and time formatting</a>.') . "</p>\n";
+	echo "\t<p class='date-time-doc'>" . __( '<a href="https://codex.wordpress.org/Formatting_Date_and_Time">Documentation on date and time formatting</a>.' ) . "</p>\n";
 ?>
 	</fieldset>
 </td>
 </tr>
 <tr>
-<th scope="row"><label for="start_of_week"><?php _e('Week Starts On') ?></label></th>
+<th scope="row"><label for="start_of_week"><?php _e( 'Week Starts On' ); ?></label></th>
 <td><select name="start_of_week" id="start_of_week">
 <?php
 /**
@@ -369,17 +391,17 @@
  */
 global $wp_locale;
 
-for ($day_index = 0; $day_index <= 6; $day_index++) :
-	$selected = (get_option('start_of_week') == $day_index) ? 'selected="selected"' : '';
-	echo "\n\t<option value='" . esc_attr($day_index) . "' $selected>" . $wp_locale->get_weekday($day_index) . '</option>';
+for ( $day_index = 0; $day_index <= 6; $day_index++ ) :
+	$selected = ( get_option( 'start_of_week' ) == $day_index ) ? 'selected="selected"' : '';
+	echo "\n\t<option value='" . esc_attr( $day_index ) . "' $selected>" . $wp_locale->get_weekday( $day_index ) . '</option>';
 endfor;
 ?>
 </select></td>
 </tr>
-<?php do_settings_fields('general', 'default'); ?>
+<?php do_settings_fields( 'general', 'default' ); ?>
 </table>
 
-<?php do_settings_sections('general'); ?>
+<?php do_settings_sections( 'general' ); ?>
 
 <?php submit_button(); ?>
 </form>