WordPress 4.0.1-scripts

[autoinstalls/wordpress.git] / wp-admin / network / site-info.php

diff --git a/wp-admin/network/site-info.php b/wp-admin/network/site-info.php
index 7dd6aeb23af3c461a3b59fcc8de8b5eb22e2bffd..2fb9fefedcd903a9b4bc53255578f5c5a388d8ed 100644 (file)
--- a/wp-admin/network/site-info.php
+++ b/wp-admin/network/site-info.php
@@ -8,7 +8,7 @@
  */
 
 /** Load WordPress Administration Bootstrap */
-require_once( './admin.php' );
+require_once( dirname( __FILE__ ) . '/admin.php' );
 
 if ( ! is_multisite() )
        wp_die( __( 'Multisite support is not enabled.' ) );
@@ -30,7 +30,7 @@ if ( ! current_user_can( 'manage_sites' ) )
 get_current_screen()->set_help_sidebar(
        '<p><strong>' . __('For more information:') . '</strong></p>' .
        '<p>' . __('<a href="http://codex.wordpress.org/Network_Admin_Sites_Screen" target="_blank">Documentation on Site Management</a>') . '</p>' .
-       '<p>' . __('<a href="http://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
+       '<p>' . __('<a href="https://wordpress.org/support/forum/multisite/" target="_blank">Support Forums</a>') . '</p>'
 );
 
 $id = isset( $_REQUEST['id'] ) ? intval( $_REQUEST['id'] ) : 0;
@@ -42,6 +42,7 @@ $details = get_blog_details( $id );
 if ( !can_edit_network( $details->site_id ) )
        wp_die( __( 'You do not have permission to access this page.' ) );
 
+$parsed = parse_url( $details->siteurl );
 $is_main_site = is_main_site( $id );
 
 if ( isset($_REQUEST['action']) && 'update-site' == $_REQUEST['action'] ) {
@@ -50,7 +51,7 @@ if ( isset($_REQUEST['action']) && 'update-site' == $_REQUEST['action'] ) {
        switch_to_blog( $id );
 
        if ( isset( $_POST['update_home_url'] ) && $_POST['update_home_url'] == 'update' ) {
-               $blog_address = get_blogaddress_by_domain( $_POST['blog']['domain'], $_POST['blog']['path'] );
+               $blog_address = esc_url_raw( $_POST['blog']['domain'] . $_POST['blog']['path'] );
                if ( get_option( 'siteurl' ) != $blog_address )
                        update_option( 'siteurl', $blog_address );
 
@@ -58,10 +59,10 @@ if ( isset($_REQUEST['action']) && 'update-site' == $_REQUEST['action'] ) {
                        update_option( 'home', $blog_address );
        }
 
-       // rewrite rules can't be flushed during switch to blog
+       // Rewrite rules can't be flushed during switch to blog.
        delete_option( 'rewrite_rules' );
 
-       // update blogs table
+       // Update blogs table.
        $blog_data = wp_unslash( $_POST['blog'] );
        $existing_details = get_blog_details( $id, false );
        $blog_data_checkboxes = array( 'public', 'archived', 'spam', 'mature', 'deleted' );
@@ -91,12 +92,11 @@ $title = sprintf( __('Edit Site: %s'), $site_url_no_http );
 $parent_file = 'sites.php';
 $submenu_file = 'sites.php';
 
-require('../admin-header.php');
+require( ABSPATH . 'wp-admin/admin-header.php' );
 
 ?>
 
 <div class="wrap">
-<?php screen_icon('ms-admin'); ?>
 <h2 id="edit-site"><?php echo $title_site_url_linked ?></h2>
 <h3 class="nav-tab-wrapper">
 <?php
@@ -123,12 +123,10 @@ if ( ! empty( $messages ) ) {
        <table class="form-table">
                <tr class="form-field form-required">
                        <th scope="row"><?php _e( 'Domain' ) ?></th>
-                       <?php
-                       $protocol = is_ssl() ? 'https://' : 'http://';
-                       if ( $is_main_site ) { ?>
-                       <td><code><?php echo $protocol; echo esc_attr( $details->domain ) ?></code></td>
+                       <?php if ( $is_main_site ) { ?>
+                               <td><code><?php echo $parsed['scheme'] . '://' . esc_attr( $details->domain ) ?></code></td>
                        <?php } else { ?>
-                       <td><?php echo $protocol; ?><input name="blog[domain]" type="text" id="domain" value="<?php echo esc_attr( $details->domain ) ?>" size="33" /></td>
+                               <td><?php echo $parsed['scheme'] . '://'; ?><input name="blog[domain]" type="text" id="domain" value="<?php echo esc_attr( $details->domain ) ?>" size="33" /></td>
                        <?php } ?>
                </tr>
                <tr class="form-field form-required">
@@ -139,7 +137,7 @@ if ( ! empty( $messages ) ) {
                        } else {
                                switch_to_blog( $id );
                        ?>
-                       <td><input name="blog[path]" type="text" id="path" value="<?php echo esc_attr( $details->path ) ?>" size="40" style='margin-bottom:5px;' />
+                       <td><input name="blog[path]" type="text" id="path" value="<?php echo esc_attr( $details->path ) ?>" size="40" style="margin-bottom:5px;" />
                        <br /><input type="checkbox" style="width:20px;" name="update_home_url" value="update" <?php if ( get_option( 'siteurl' ) == untrailingslashit( get_blogaddress_by_id ($id ) ) || get_option( 'home' ) == untrailingslashit( get_blogaddress_by_id( $id ) ) ) echo 'checked="checked"'; ?> /> <?php _e( 'Update <code>siteurl</code> and <code>home</code> as well.' ); ?></td>
                        <?php
                                restore_current_blog();
@@ -177,4 +175,4 @@ if ( ! empty( $messages ) ) {
 
 </div>
 <?php
-require('../admin-footer.php');
+require( ABSPATH . 'wp-admin/admin-footer.php' );