Changeset 12978 for trunk/wp-admin/ms-sites.php

Timestamp:

02/05/2010 09:49:19 PM (16 years ago)

Author:

ryan

Message:

Introduce get_home_url(), get_site_url(), and get_admin_url() for fetching urls by blog id. see #12119

File:

• trunk/wp-admin/ms-sites.php (modified) (6 diffs)

trunk/wp-admin/ms-sites.php

@@ -83 +83 @@
         <div class="wrap">
         <?php screen_icon(); ?>
-        <h2><?php _e('Edit Site'); ?> - <a href='http://<?php echo $details->domain . $details->path; ?>'>http://<?php echo $details->domain . $details->path; ?></a></h2>
+        <h2><?php _e('Edit Site'); ?> - <a href='<?php echo get_home_url($id); ?>'><?php echo get_home_url($id); ?></a></h2>
         <form method="post" action="ms-edit.php?action=updateblog">
             <?php wp_nonce_field('editblog'); ?>
@@ -94 +94 @@
                             <tr class="form-field form-required">
                                 <th scope="row"><?php _e('Domain') ?></th>
-                                <td>http://<input name="blog[domain]" type="text" id="domain" value="<?php echo $details->domain ?>" size="33" /></td>
+                                <td>http://<input name="blog[domain]" type="text" id="domain" value="<?php echo esc_attr($details->domain) ?>" size="33" /></td>
                             </tr>
                             <tr class="form-field form-required">
                                 <th scope="row"><?php _e('Path') ?></th>
                                 <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_blog_option( $id, 'siteurl' ) == preg_replace('|/+$|', '', 'http://' . $details->domain . $details->path) || get_blog_option( $id, 'home' ) == preg_replace('|/+$|', '', 'http://' . $details->domain . $details->path) ) echo 'checked="checked"'; ?> /> <?php _e( "Update 'siteurl' and 'home' as well." ); ?></td>
+                                <br /><input type='checkbox' style='width:20px;' name='update_home_url' value='update' <?php if ( get_blog_option( $id, 'siteurl' ) == untrailingslashit( get_blogaddress_by_id($id) ) || get_blog_option( $id, 'home' ) == untrailingslashit( get_blogaddress_by_id($id) ) ) echo 'checked="checked"'; ?> /> <?php _e( "Update 'siteurl' and 'home' as well." ); ?></td>
                             </tr>
                             <tr class="form-field">
@@ -447 +447 @@
             if ( $blog_list ) {
                 $status_list = array( 'archived' => array( 'site-archived', __('Archived') ), 'spam' => array( 'site-spammed', __('Spam') ), 'deleted' => array( 'site-deleted', __('Deleted') ) );
+                $class = '';
                 foreach ( $blog_list as $blog ) {
                     $class = ('alternate' == $class) ? '' : 'alternate';
@@ -491 +492 @@
                                     $actions    = array();
                                     $actions[]  = '<a href="ms-sites.php?action=editblog&amp;id=' . $blog['blog_id'] . '" class="edit">' . __('Edit') . '</a>';
-                                    $actions[]  = "<a href='{$protocol}{$blog['domain']}{$blog['path']}wp-admin/' class='edit'>" . __('Backend') . '</a>';
+                                    $actions[]  = "<a href='" . get_admin_url($blog['blog_id']) . "' class='edit'>" . __('Backend') . '</a>';
 
                                     if ( get_blog_status( $blog['blog_id'], "deleted" ) == '1' )
@@ -510 +511 @@
                                     $actions[]  = '<a class="delete" href="ms-edit.php?action=confirm&amp;action2=deleteblog&amp;id=' . $blog['blog_id'] . '&amp;msg=' . urlencode( sprintf( __( "You are about to delete the blog %s" ), $blogname ) ) . '">' . __("Delete") . '</a>';
 
-                                    $actions[]  = "<a href='http://{$blog['domain']}{$blog['path']}' rel='permalink'>" . __('Visit') . '</a>';
+                                    $actions[]  = "<a href='" . get_home_url($blog['blog_id']) . "' rel='permalink'>" . __('Visit') . '</a>';
                                     ?>
 
@@ -543 +544 @@
                                         if ( count( $blogusers ) > 5 ) {
                                             $blogusers = array_slice( $blogusers, 0, 5 );
-                                            $blogusers_warning = __( 'Only showing first 5 users.' ) . ' <a href="' . $protocol . $blog[ 'domain' ] . $blog[ 'path' ] . 'wp-admin/users.php">' . __( 'More' ) . '</a>';
+                                            $blogusers_warning = __( 'Only showing first 5 users.' ) . ' <a href="' . get_admin_url($blog['blog_id'], 'users.php') . '">' . __( 'More' ) . '</a>';
                                         }
                                         foreach ( $blogusers as $key => $val )