--- a/wp/wp-admin/network/site-info.php Mon Oct 14 18:06:33 2019 +0200
+++ b/wp/wp-admin/network/site-info.php Mon Oct 14 18:28:13 2019 +0200
@@ -20,7 +20,7 @@
$id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
if ( ! $id ) {
- wp_die( __('Invalid site ID.') );
+ wp_die( __( 'Invalid site ID.' ) );
}
$details = get_site( $id );
@@ -33,7 +33,7 @@
}
$parsed_scheme = parse_url( $details->siteurl, PHP_URL_SCHEME );
-$is_main_site = is_main_site( $id );
+$is_main_site = is_main_site( $id );
if ( isset( $_REQUEST['action'] ) && 'update-site' == $_REQUEST['action'] ) {
check_admin_referer( 'edit-site' );
@@ -43,13 +43,13 @@
// Rewrite rules can't be flushed during switch to blog.
delete_option( 'rewrite_rules' );
- $blog_data = wp_unslash( $_POST['blog'] );
+ $blog_data = wp_unslash( $_POST['blog'] );
$blog_data['scheme'] = $parsed_scheme;
if ( $is_main_site ) {
// On the network's main site, don't allow the domain or path to change.
$blog_data['domain'] = $details->domain;
- $blog_data['path'] = $details->path;
+ $blog_data['path'] = $details->path;
} else {
// For any other site, the scheme, domain, and path can all be changed. We first
// need to ensure a scheme has been provided, otherwise fallback to the existing.
@@ -67,10 +67,10 @@
$blog_data['scheme'] = $update_parsed_url['scheme'];
$blog_data['domain'] = $update_parsed_url['host'];
- $blog_data['path'] = $update_parsed_url['path'];
+ $blog_data['path'] = $update_parsed_url['path'];
}
- $existing_details = get_site( $id );
+ $existing_details = get_site( $id );
$blog_data_checkboxes = array( 'public', 'archived', 'spam', 'mature', 'deleted' );
foreach ( $blog_data_checkboxes as $c ) {
if ( ! in_array( $existing_details->$c, array( 0, 1 ) ) ) {
@@ -85,7 +85,7 @@
// Maybe update home and siteurl options.
$new_details = get_site( $id );
- $old_home_url = trailingslashit( esc_url( get_option( 'home' ) ) );
+ $old_home_url = trailingslashit( esc_url( get_option( 'home' ) ) );
$old_home_parsed = parse_url( $old_home_url );
if ( $old_home_parsed['host'] === $existing_details->domain && $old_home_parsed['path'] === $existing_details->path ) {
@@ -93,7 +93,7 @@
update_option( 'home', $new_home_url );
}
- $old_site_url = trailingslashit( esc_url( get_option( 'siteurl' ) ) );
+ $old_site_url = trailingslashit( esc_url( get_option( 'siteurl' ) ) );
$old_site_parsed = parse_url( $old_site_url );
if ( $old_site_parsed['host'] === $existing_details->domain && $old_site_parsed['path'] === $existing_details->path ) {
@@ -102,7 +102,15 @@
}
restore_current_blog();
- wp_redirect( add_query_arg( array( 'update' => 'updated', 'id' => $id ), 'site-info.php' ) );
+ wp_redirect(
+ add_query_arg(
+ array(
+ 'update' => 'updated',
+ 'id' => $id,
+ ),
+ 'site-info.php'
+ )
+ );
exit;
}
@@ -116,7 +124,7 @@
/* translators: %s: site name */
$title = sprintf( __( 'Edit Site: %s' ), esc_html( $details->blogname ) );
-$parent_file = 'sites.php';
+$parent_file = 'sites.php';
$submenu_file = 'sites.php';
require( ABSPATH . 'wp-admin/admin-header.php' );
@@ -128,10 +136,12 @@
<p class="edit-site-actions"><a href="<?php echo esc_url( get_home_url( $id, '/' ) ); ?>"><?php _e( 'Visit' ); ?></a> | <a href="<?php echo esc_url( get_admin_url( $id ) ); ?>"><?php _e( 'Dashboard' ); ?></a></p>
<?php
-network_edit_site_nav( array(
- 'blog_id' => $id,
- 'selected' => 'site-info'
-) );
+network_edit_site_nav(
+ array(
+ 'blog_id' => $id,
+ 'selected' => 'site-info',
+ )
+);
if ( ! empty( $messages ) ) {
foreach ( $messages as $msg ) {
@@ -141,31 +151,33 @@
?>
<form method="post" action="site-info.php?action=update-site">
<?php wp_nonce_field( 'edit-site' ); ?>
- <input type="hidden" name="id" value="<?php echo esc_attr( $id ) ?>" />
- <table class="form-table">
+ <input type="hidden" name="id" value="<?php echo esc_attr( $id ); ?>" />
+ <table class="form-table" role="presentation">
<?php
// The main site of the network should not be updated on this page.
- if ( $is_main_site ) : ?>
+ if ( $is_main_site ) :
+ ?>
<tr class="form-field">
<th scope="row"><?php _e( 'Site Address (URL)' ); ?></th>
<td><?php echo esc_url( $parsed_scheme . '://' . $details->domain . $details->path ); ?></td>
</tr>
- <?php
- // For any other site, the scheme, domain, and path can all be changed.
- else : ?>
+ <?php
+ // For any other site, the scheme, domain, and path can all be changed.
+ else :
+ ?>
<tr class="form-field form-required">
- <th scope="row"><?php _e( 'Site Address (URL)' ); ?></th>
+ <th scope="row"><label for="url"><?php _e( 'Site Address (URL)' ); ?></label></th>
<td><input name="blog[url]" type="text" id="url" value="<?php echo $parsed_scheme . '://' . esc_attr( $details->domain ) . esc_attr( $details->path ); ?>" /></td>
</tr>
<?php endif; ?>
<tr class="form-field">
- <th scope="row"><label for="blog_registered"><?php _ex( 'Registered', 'site' ) ?></label></th>
- <td><input name="blog[registered]" type="text" id="blog_registered" value="<?php echo esc_attr( $details->registered ) ?>" /></td>
+ <th scope="row"><label for="blog_registered"><?php _ex( 'Registered', 'site' ); ?></label></th>
+ <td><input name="blog[registered]" type="text" id="blog_registered" value="<?php echo esc_attr( $details->registered ); ?>" /></td>
</tr>
<tr class="form-field">
<th scope="row"><label for="blog_last_updated"><?php _e( 'Last Updated' ); ?></label></th>
- <td><input name="blog[last_updated]" type="text" id="blog_last_updated" value="<?php echo esc_attr( $details->last_updated ) ?>" /></td>
+ <td><input name="blog[last_updated]" type="text" id="blog_last_updated" value="<?php echo esc_attr( $details->last_updated ); ?>" /></td>
</tr>
<?php
$attribute_fields = array( 'public' => __( 'Public' ) );
@@ -180,9 +192,9 @@
<th scope="row"><?php _e( 'Attributes' ); ?></th>
<td>
<fieldset>
- <legend class="screen-reader-text"><?php _e( 'Set site attributes' ) ?></legend>
+ <legend class="screen-reader-text"><?php _e( 'Set site attributes' ); ?></legend>
<?php foreach ( $attribute_fields as $field_key => $field_label ) : ?>
- <label><input type="checkbox" name="blog[<?php echo $field_key; ?>]" value="1" <?php checked( (bool) $details->$field_key, true ); disabled( ! in_array( $details->$field_key, array( 0, 1 ) ) ); ?> />
+ <label><input type="checkbox" name="blog[<?php echo $field_key; ?>]" value="1" <?php checked( (bool) $details->$field_key, true ); ?> <?php disabled( ! in_array( $details->$field_key, array( 0, 1 ) ) ); ?> />
<?php echo $field_label; ?></label><br/>
<?php endforeach; ?>
<fieldset>