Ticket #12119: wpmu-blogs.diff

wpmu-blogs.php

@@ -75 +75 @@
                 $editblog_roles = get_blog_option( $id, "{$blog_prefix}user_roles" );
                 ?>
                 <div class="wrap">
-                <h2><?php _e('Edit Blog'); ?> - <a href='http://<?php echo $details['domain'].$details['path']; ?>'>http://<?php echo $details['domain'].$details['path']; ?></a></h2>
+                <h2><?php _e('Edit Blog'); ?> - <a href='<?php echo ${protocol} . $details['domain'].$details['path']; ?>'><?php echo $protocol . $details['domain'].$details['path']; ?></a></h2>
                 <form method="post" action="wpmu-edit.php?action=updateblog"> 
                         <?php wp_nonce_field('editblog'); ?>
                         <input type="hidden" name="id" value="<?php echo $id ?>" /> 
@@ -86 +86 @@
                                 <table class="form-table">
                                                         <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><?php echo $protocol ?><input name="blog[domain]" type="text" id="domain" value="<?php echo $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 $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' ) == preg_replace('|/+$|', '', '${protocol}' . $details['domain'] . $details['path']) || get_blog_option( $id, 'home' ) == preg_replace('|/+$|', '', '${protocol}' . $details['domain'] . $details['path']) ) echo 'checked="checked"'; ?> /> <?php _e( "Update 'siteurl' and 'home' as well." ); ?></td>
                                                         </tr> 
                                                         <tr class="form-field">
                                                                 <th scope="row"><?php _e('Registered') ?></th> 
@@ -491 +491 @@
                                                                         
                                                                         $controlActions[]       = '<a class="delete" href="wpmu-edit.php?action=confirm&amp;action2=deleteblog&amp;id=' . $blog['blog_id'] . '">' . __("Delete") . '</a>';
                                                                         
-                                                                        $controlActions[]       = "<a href='http://{$blog['domain']}{$blog['path']}' rel='permalink'>" . __('Visit') . '</a>';
+                                                                        $controlActions[]       = "<a href='${protocol}{$blog['domain']}{$blog['path']}' rel='permalink'>" . __('Visit') . '</a>';
                                                                         ?>
                                                                         
                                                                         <?php if (count($controlActions)) : ?>