Changeset 13379
- Timestamp:
- 02/24/2010 07:56:10 PM (15 years ago)
- Location:
- trunk/wp-admin
- Files:
-
- 5 edited
-
ms-admin.php (modified) (1 diff)
-
ms-edit.php (modified) (5 diffs)
-
ms-options.php (modified) (20 diffs)
-
ms-sites.php (modified) (7 diffs)
-
ms-users.php (modified) (2 diffs)
Legend:
- Unmodified
- Added
- Removed
-
trunk/wp-admin/ms-admin.php
r13301 r13379 23 23 24 24 $user_text = sprintf( _n( '%s user', '%s users', $c_users ), number_format_i18n( $c_users ) ); 25 $blog_text = sprintf( _n( '%s blog', '%s blogs', $c_blogs ), number_format_i18n( $c_blogs ) );25 $blog_text = sprintf( _n( '%s site', '%s sites', $c_blogs ), number_format_i18n( $c_blogs ) ); 26 26 27 27 $sentence = sprintf( __( 'You have %1$s and %2$s.' ), $blog_text, $user_text ); -
trunk/wp-admin/ms-edit.php
r13311 r13379 142 142 143 143 if ( is_array( $_POST[ 'blog' ] ) == false ) 144 wp_die( "Can't create an empty blog." );144 wp_die( "Can't create an empty site." ); 145 145 $blog = $_POST['blog']; 146 146 $domain = sanitize_user( str_replace( '/', '', $blog[ 'domain' ] ) ); … … 149 149 150 150 if ( empty($domain) || empty($email) ) 151 wp_die( __('Missing blogaddress or email address.') );151 wp_die( __('Missing site address or email address.') ); 152 152 if ( !is_email( $email ) ) 153 153 wp_die( __('Invalid email address') ); … … 179 179 if ( get_user_option( 'primary_blog', $user_id ) == $dashboard_blog->blog_id ) 180 180 update_user_option( $user_id, 'primary_blog', $id, true ); 181 $content_mail = sprintf( __( "New blogcreated by %1s\n\nAddress: http://%2s\nName: %3s"), $current_user->user_login , $newdomain.$path, stripslashes( $title ) );182 wp_mail( get_site_option('admin_email'), sprintf(__('[%s] New BlogCreated'), $current_site->site_name), $content_mail, 'From: "Site Admin" <' . get_site_option( 'admin_email' ) . '>' );181 $content_mail = sprintf( __( "New site created by %1s\n\nAddress: http://%2s\nName: %3s"), $current_user->user_login , $newdomain.$path, stripslashes( $title ) ); 182 wp_mail( get_site_option('admin_email'), sprintf(__('[%s] New Site Created'), $current_site->site_name), $content_mail, 'From: "Site Admin" <' . get_site_option( 'admin_email' ) . '>' ); 183 183 wpmu_welcome_notification( $id, $user_id, $password, $title, array( "public" => 1 ) ); 184 184 wp_redirect( add_query_arg( array('updated' => 'true', 'action' => 'add-blog'), $_SERVER['HTTP_REFERER'] ) ); … … 440 440 <html xmlns="http://www.w3.org/1999/xhtml" <?php if ( function_exists('language_attributes') ) language_attributes(); ?>> 441 441 <head> 442 <title><?php _e("WordPress MU› Confirm your action"); ?></title>442 <title><?php _e("WordPress › Confirm your action"); ?></title> 443 443 444 444 <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> … … 499 499 $user = new WP_User( $val ); 500 500 if ( in_array( $user->user_login, get_site_option( 'site_admins', array( 'admin' ) ) ) ) 501 wp_die( sprintf( __( 'Warning! User cannot be modified. The user %s is a siteadmnistrator.' ), $user->user_login ) );501 wp_die( sprintf( __( 'Warning! User cannot be modified. The user %s is a network admnistrator.' ), $user->user_login ) ); 502 502 if ( isset($_POST['alluser_spam']) ) { 503 503 $userfunction = 'all_spam'; -
trunk/wp-admin/ms-options.php
r13301 r13379 22 22 <div class="wrap"> 23 23 <?php screen_icon(); ?> 24 <h2><?php _e(' SiteOptions') ?></h2>24 <h2><?php _e('Network Options') ?></h2> 25 25 <form method="post" action="ms-edit.php?action=siteoptions"> 26 26 <?php wp_nonce_field( "siteoptions" ); ?> 27 <h3><?php _e('Operational Settings <em>(These settings cannot be modified by blogowners)</em>') ?></h3>28 <table class="form-table"> 29 <tr valign="top"> 30 <th scope="row"><?php _e(' SiteName') ?></th>27 <h3><?php _e('Operational Settings <em>(These settings cannot be modified by site owners)</em>') ?></h3> 28 <table class="form-table"> 29 <tr valign="top"> 30 <th scope="row"><?php _e('Network Name') ?></th> 31 31 <td> 32 32 <input name="site_name" type="text" id="site_name" style="width: 95%" value="<?php echo esc_attr($current_site->site_name) ?>" size="45" /> … … 37 37 38 38 <tr valign="top"> 39 <th scope="row"><?php _e(' SiteAdmin Email') ?></th>39 <th scope="row"><?php _e('Network Admin Email') ?></th> 40 40 <td> 41 41 <input name="admin_email" type="text" id="admin_email" style="width: 95%" value="<?php echo esc_attr( get_site_option('admin_email') ) ?>" size="45" /> … … 53 53 <td> 54 54 <label><input name="registration" type="radio" id="registration1" value='none' <?php checked( get_site_option('registration'), 'none') ?> /> <?php _e('Disabled'); ?></label><br /> 55 <label><input name="registration" type="radio" id="registration2" value='all' <?php checked( get_site_option('registration'), 'all') ?> /> <?php _e('Enabled. Blogs and user accounts can be created.'); ?></label><br />55 <label><input name="registration" type="radio" id="registration2" value='all' <?php checked( get_site_option('registration'), 'all') ?> /> <?php _e('Enabled. Sites and user accounts can be created.'); ?></label><br /> 56 56 <label><input name="registration" type="radio" id="registration3" value='user' <?php checked( get_site_option('registration'), 'user') ?> /> <?php _e('Only user account can be created.'); ?></label><br /> 57 <label><input name="registration" type="radio" id="registration4" value='blog' <?php checked( get_site_option('registration'), 'blog') ?> /> <?php _e('Only logged in users can create new blogs.'); ?></label><br />58 <p><?php _e('Disable or enable registration and who or what can be registered. (Default= all)'); ?></p>57 <label><input name="registration" type="radio" id="registration4" value='blog' <?php checked( get_site_option('registration'), 'blog') ?> /> <?php _e('Only logged in users can create new sites.'); ?></label><br /> 58 <p><?php _e('Disable or enable registration and who or what can be registered. (Default=Disabled)'); ?></p> 59 59 <?php if ( is_subdomain_install() ) { 60 echo '<p>' . __('If registration is disabled, please set "NOBLOGREDIRECT" in wp-config.php to a url you will redirect visitors to if they visit a non existant blog.') . '</p>';60 echo '<p>' . __('If registration is disabled, please set "NOBLOGREDIRECT" in wp-config.php to a url you will redirect visitors to if they visit a non existant site.') . '</p>'; 61 61 } ?> 62 62 </td> … … 72 72 <input name="registrationnotification" type="radio" id="registrationnotification1" value='yes' <?php checked( get_site_option('registrationnotification'), 'yes') ?> /> <?php _e('Yes'); ?><br /> 73 73 <input name="registrationnotification" type="radio" id="registrationnotification2" value='no' <?php checked( get_site_option('registrationnotification'), 'no') ?> /> <?php _e('No'); ?><br /> 74 <?php _e('Send the site admin an email notification every time someone registers a blogor user account.') ?>74 <?php _e('Send the network admin an email notification every time someone registers a site or user account.') ?> 75 75 </td> 76 76 </tr> … … 80 80 <td> 81 81 <a name='addnewusers'></a> 82 <input name="add_new_users" type="radio" id="add_new_users1" value='1' <?php checked( get_site_option('add_new_users') ) ?> /> <?php _e('Yes'); ?><br />83 <input name="add_new_users" type="radio" id="add_new_users2" value='0' <?php checked( get_site_option('add_new_users'), 0 ) ?> /> <?php _e('No'); ?><br />84 <?php _e('Allow blog administrators to add new users to their blogvia the Users->Add New page.') ?>85 </td> 86 </tr> 87 88 <tr valign="top"> 89 <th scope="row"><?php _e('Dashboard Blog') ?></th>82 <input name="add_new_users" type="radio" id="add_new_users1" value='1' <?php checked( get_site_option('add_new_users'), 1 ) ?> /> <?php _e('Yes'); ?><br /> 83 <input name="add_new_users" type="radio" id="add_new_users2" value='0' <?php checked( get_site_option('add_new_users'), 0 ) ?> /> <?php _e('No'); ?><br /> 84 <?php _e('Allow site administrators to add new users to their site via the Users->Add New page.') ?> 85 </td> 86 </tr> 87 88 <tr valign="top"> 89 <th scope="row"><?php _e('Dashboard Site') ?></th> 90 90 <td> 91 91 <?php … … 99 99 <input name="dashboard_blog" type="text" id="dashboard_blog" value="<?php echo esc_attr($blogname); ?>" size="30" /> 100 100 <br /> 101 <?php _e( "Blogname ('dashboard', 'control', 'manager', etc) or blog id.<br />New users are added to this blog as subscribers (or the user role defined below) if they don't have a blog. Leave blank for the main blog. 'Subscriber' users on old blog will be moved to the new blog if changed. New blogwill be created if it does not exist." ); ?>101 <?php _e( "Blogname ('dashboard', 'control', 'manager', etc) or blog id.<br />New users are added to this site as subscribers (or the user role defined below) if they don't have a site. Leave blank for the main site. 'Subscriber' users on old site will be moved to the new site if changed. New site will be created if it does not exist." ); ?> 102 102 </td> 103 103 </tr> … … 110 110 </select> 111 111 <br /> 112 <?php _e( "The default role for new users on the Dashboard blog. This should probably be 'Subscriber' or maybe 'Contributor'." ); ?>112 <?php _e( "The default role for new users on the Dashboard site. This should probably be 'Subscriber' or maybe 'Contributor'." ); ?> 113 113 </td> 114 114 </tr> … … 119 119 <input name="illegal_names" type="text" id="illegal_names" style="width: 95%" value="<?php echo esc_attr( implode( " ", get_site_option('illegal_names') ) ); ?>" size="45" /> 120 120 <br /> 121 <?php _e('Users are not allowed to register these blogs. Separate names by spaces.') ?>121 <?php _e('Users are not allowed to register these sites. Separate names by spaces.') ?> 122 122 </td> 123 123 </tr> … … 130 130 <textarea name="limited_email_domains" id="limited_email_domains" cols='40' rows='5'><?php echo $limited_email_domains == '' ? '' : @implode( "\n", $limited_email_domains ); ?></textarea> 131 131 <br /> 132 <?php _e('If you want to limit blogregistrations to certain domains. One domain per line.') ?>132 <?php _e('If you want to limit site registrations to certain domains. One domain per line.') ?> 133 133 </td> 134 134 </tr> … … 139 139 <textarea name="banned_email_domains" id="banned_email_domains" cols='40' rows='5'><?php echo get_site_option('banned_email_domains') == '' ? '' : @implode( "\n", get_site_option('banned_email_domains') ); ?></textarea> 140 140 <br /> 141 <?php _e('If you want to ban certain email domains from blogregistrations. One domain per line.') ?>141 <?php _e('If you want to ban certain email domains from site registrations. One domain per line.') ?> 142 142 </td> 143 143 </tr> … … 148 148 <textarea name="welcome_email" id="welcome_email" rows='5' cols='45' style="width: 95%"><?php echo stripslashes( get_site_option('welcome_email') ) ?></textarea> 149 149 <br /> 150 <?php _e('The welcome email sent to new blogowners.') ?>150 <?php _e('The welcome email sent to new site owners.') ?> 151 151 </td> 152 152 </tr> … … 164 164 <textarea name="first_post" id="first_post" rows='5' cols='45' style="width: 95%"><?php echo stripslashes( get_site_option('first_post') ) ?></textarea> 165 165 <br /> 166 <?php _e('First post on a new blog.') ?>166 <?php _e('First post on a new site.') ?> 167 167 </td> 168 168 </tr> … … 172 172 <textarea name="first_page" id="first_page" rows='5' cols='45' style="width: 95%"><?php echo stripslashes( get_site_option('first_page') ) ?></textarea> 173 173 <br /> 174 <?php _e('First page on a new blog.') ?>174 <?php _e('First page on a new site.') ?> 175 175 </td> 176 176 </tr> … … 180 180 <textarea name="first_comment" id="first_comment" rows='5' cols='45' style="width: 95%"><?php echo stripslashes( get_site_option('first_comment') ) ?></textarea> 181 181 <br /> 182 <?php _e('First comment on a new blog.') ?>182 <?php _e('First comment on a new site.') ?> 183 183 </td> 184 184 </tr> … … 188 188 <input type="text" size='40' name="first_comment_author" id="first_comment_author" value="<?php echo get_site_option('first_comment_author') ?>" /> 189 189 <br /> 190 <?php _e('Author of first comment on a new blog.') ?>190 <?php _e('Author of first comment on a new site.') ?> 191 191 </td> 192 192 </tr> … … 196 196 <input type="text" size='40' name="first_comment_url" id="first_comment_url" value="<?php echo esc_attr(get_site_option('first_comment_url')) ?>" /> 197 197 <br /> 198 <?php _e('URL on first comment on a new blog.') ?>198 <?php _e('URL on first comment on a new site.') ?> 199 199 </td> 200 200 </tr> … … 209 209 </tr> 210 210 <tr valign="top"> 211 <th scope="row"><?php _e(' Blogupload space check') ?></th>211 <th scope="row"><?php _e('Site upload space check') ?></th> 212 212 <td> 213 213 <label><input type='radio' id="upload_space_check_disabled" name="upload_space_check_disabled" value='0' <?php checked( get_site_option( 'upload_space_check_disabled' ), 0 ) ?>/> <?php _e( 'Enabled' ); ?></label><br /> … … 216 216 </tr> 217 217 <tr valign="top"> 218 <th scope="row"><?php _e(' Blogupload space') ?></th>218 <th scope="row"><?php _e('Site upload space') ?></th> 219 219 <td><input name="blog_upload_space" type="text" id="blog_upload_space" value="<?php echo esc_attr( get_site_option('blog_upload_space', 10) ) ?>" size="3" /> MB</td> 220 220 </tr> … … 232 232 <th scope="row"><?php _e('Admin Notice Feed') ?></th> 233 233 <td><input name="admin_notice_feed" style="width: 95%" type="text" id="admin_notice_feed" value="<?php echo esc_attr( get_site_option( 'admin_notice_feed' ) ) ?>" size="80" /><br /> 234 <?php _e( 'Display the latest post from this RSS or Atom feed on all blogdashboards. Leave blank to disable.' ); ?><br />234 <?php _e( 'Display the latest post from this RSS or Atom feed on all site dashboards. Leave blank to disable.' ); ?><br /> 235 235 <?php if ( get_site_option( 'admin_notice_feed' ) != 'http://' . $current_site->domain . $current_site->path . 'feed/' ) 236 echo __( "A good one to use would be the feed from your main blog: " ) . 'http://' . $current_site->domain . $current_site->path . 'feed/'; ?></td>236 echo __( "A good one to use would be the feed from your main site: " ) . 'http://' . $current_site->domain . $current_site->path . 'feed/'; ?></td> 237 237 </tr> 238 238 </table> … … 241 241 <table class="form-table"> 242 242 <tr valign="top"> 243 <th scope="row"><?php _e(' SiteAdmins') ?></th>243 <th scope="row"><?php _e('Network Admins') ?></th> 244 244 <td> 245 245 <input name="site_admins" type="text" id="site_admins" style="width: 95%" value="<?php echo esc_attr( implode(' ', get_site_option( 'site_admins', array( 'admin' ) ) ) ) ?>" size="45" /> 246 246 <br /> 247 <?php _e('These users may login to the main blog and administer the site. Space separated list of usernames.') ?>248 </td> 249 </tr> 250 </table> 251 252 <h3><?php _e(' Site Wide Settings <em>(These settings may be overridden by blogowners)</em>') ?></h3>247 <?php _e('These users may login to the main site and administer the network. Space separated list of usernames.') ?> 248 </td> 249 </tr> 250 </table> 251 252 <h3><?php _e('Network Wide Settings <em>(These settings may be overridden by site owners)</em>') ?></h3> 253 253 <table class="form-table"> 254 254 <?php -
trunk/wp-admin/ms-sites.php
r13301 r13379 24 24 switch ($_GET['action']) { 25 25 case 'all_notspam': 26 _e(' Blogs mark as not spam !');26 _e('Sites mark as not spam !'); 27 27 break; 28 28 case 'all_spam': 29 _e(' Blogs mark as spam !');29 _e('Sites mark as spam !'); 30 30 break; 31 31 case 'all_delete': 32 _e(' Blogs deleted !');32 _e('Sites deleted !'); 33 33 break; 34 34 case 'delete': 35 _e(' Blogdeleted !');35 _e('Site deleted !'); 36 36 break; 37 37 case 'add-blog': 38 _e(' Blogadded !');38 _e('Site added !'); 39 39 break; 40 40 case 'archive': 41 _e(' Blogarchived !');41 _e('Site archived !'); 42 42 break; 43 43 case 'unarchive': 44 _e(' Blogunarchived !');44 _e('Site unarchived !'); 45 45 break; 46 46 case 'activate': 47 _e(' Blogactivated !');47 _e('Site activated !'); 48 48 break; 49 49 case 'deactivate': 50 _e(' Blogdeactivated !');50 _e('Site deactivated !'); 51 51 break; 52 52 case 'unspam': 53 _e(' Blogmark as not spam !');53 _e('Site mark as not spam !'); 54 54 break; 55 55 case 'spam': 56 _e(' Blogmark as spam !');56 _e('Site mark as spam !'); 57 57 break; 58 58 case 'umature': 59 _e(' Blogmark as not mature !');59 _e('Site mark as not mature !'); 60 60 break; 61 61 case 'mature': 62 _e(' Blogmark as mature !');62 _e('Site mark as mature !'); 63 63 break; 64 64 default: … … 90 90 <div class='metabox-holder' style='width:49%;float:left;'> 91 91 <div id="blogedit_bloginfo" class="postbox " > 92 <h3 class='hndle'><span><?php _e(' Bloginfo (wp_blogs)'); ?></span></h3>92 <h3 class='hndle'><span><?php _e('Site info (wp_blogs)'); ?></span></h3> 93 93 <div class="inside"> 94 94 <table class="form-table"> … … 158 158 159 159 <div id="blogedit_blogoptions" class="postbox " > 160 <h3 class='hndle'><span><?php printf( __(' Blogoptions (%soptions)'), $blog_prefix ); ?></span></h3>160 <h3 class='hndle'><span><?php printf( __('Site options (%soptions)'), $blog_prefix ); ?></span></h3> 161 161 <div class="inside"> 162 162 <table class="form-table"> … … 224 224 ?> 225 225 <div id="blogedit_blogthemes" class="postbox"> 226 <h3 class='hndle'><span><?php esc_html_e(' BlogThemes'); ?></span></h3>226 <h3 class='hndle'><span><?php esc_html_e('Site Themes'); ?></span></h3> 227 227 <div class="inside"> 228 228 <table class="form-table"> … … 238 238 $blogusers = get_users_of_blog( $id ); 239 239 if ( is_array( $blogusers ) ) { 240 echo '<div id="blogedit_blogusers" class="postbox"><h3 class="hndle"><span>' . __(' BlogUsers') . '</span></h3><div class="inside">';240 echo '<div id="blogedit_blogusers" class="postbox"><h3 class="hndle"><span>' . __('Site Users') . '</span></h3><div class="inside">'; 241 241 echo '<table class="form-table">'; 242 242 echo "<tr><th>" . __('User') . "</th><th>" . __('Role') . "</th><th>" . __('Password') . "</th><th>" . __('Remove') . "</th></tr>"; … … 306 306 307 307 <div id="blogedit_miscoptions" class="postbox"> 308 <h3 class='hndle'><span><?php _e('Misc BlogActions') ?></span></h3>308 <h3 class='hndle'><span><?php _e('Misc Site Actions') ?></span></h3> 309 309 <div class="inside"> 310 310 <table class="form-table"> … … 508 508 509 509 if ( get_blog_status( $blog['blog_id'], "deleted" ) == '1' ) 510 $actions[] = '<a class="delete" href="ms-edit.php?action=confirm&action2=activateblog&ref=' . urlencode( $_SERVER['REQUEST_URI'] ) . '&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( "You are about to activate the blog%s" ), $blogname ) ) . '">' . __('Activate') . '</a>';510 $actions[] = '<a class="delete" href="ms-edit.php?action=confirm&action2=activateblog&ref=' . urlencode( $_SERVER['REQUEST_URI'] ) . '&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( "You are about to activate the site %s" ), $blogname ) ) . '">' . __('Activate') . '</a>'; 511 511 else 512 $actions[] = '<a class="delete" href="ms-edit.php?action=confirm&action2=deactivateblog&ref=' . urlencode( $_SERVER['REQUEST_URI'] ) . '&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( "You are about to deactivate the blog%s" ), $blogname ) ) . '">' . __('Deactivate') . '</a>';512 $actions[] = '<a class="delete" href="ms-edit.php?action=confirm&action2=deactivateblog&ref=' . urlencode( $_SERVER['REQUEST_URI'] ) . '&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( "You are about to deactivate the site %s" ), $blogname ) ) . '">' . __('Deactivate') . '</a>'; 513 513 514 514 if ( get_blog_status( $blog['blog_id'], "archived" ) == '1' ) 515 $actions[] = '<a class="delete" href="ms-edit.php?action=confirm&action2=unarchiveblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( "You are about to unarchive the blog%s" ), $blogname ) ) . '">' . __('Unarchive') . '</a>';515 $actions[] = '<a class="delete" href="ms-edit.php?action=confirm&action2=unarchiveblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( "You are about to unarchive the site %s" ), $blogname ) ) . '">' . __('Unarchive') . '</a>'; 516 516 else 517 $actions[] = '<a class="delete" href="ms-edit.php?action=confirm&action2=archiveblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( "You are about to archive the blog%s" ), $blogname ) ) . '">' . __('Archive') . '</a>';517 $actions[] = '<a class="delete" href="ms-edit.php?action=confirm&action2=archiveblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( "You are about to archive the site %s" ), $blogname ) ) . '">' . __('Archive') . '</a>'; 518 518 519 519 if ( get_blog_status( $blog['blog_id'], "spam" ) == '1' ) 520 $actions[] = '<a class="delete" href="ms-edit.php?action=confirm&action2=unspamblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( "You are about to unspam the blog%s" ), $blogname ) ) . '">' . __('Not Spam') . '</a>';520 $actions[] = '<a class="delete" href="ms-edit.php?action=confirm&action2=unspamblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( "You are about to unspam the site %s" ), $blogname ) ) . '">' . __('Not Spam') . '</a>'; 521 521 else 522 $actions[] = '<a class="delete" href="ms-edit.php?action=confirm&action2=spamblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( "You are about to mark the blog%s as spam" ), $blogname ) ) . '">' . __("Spam") . '</a>';523 524 $actions[] = '<a class="delete" href="ms-edit.php?action=confirm&action2=deleteblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( "You are about to delete the blog%s" ), $blogname ) ) . '">' . __("Delete") . '</a>';522 $actions[] = '<a class="delete" href="ms-edit.php?action=confirm&action2=spamblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( "You are about to mark the site %s as spam" ), $blogname ) ) . '">' . __("Spam") . '</a>'; 523 524 $actions[] = '<a class="delete" href="ms-edit.php?action=confirm&action2=deleteblog&id=' . $blog['blog_id'] . '&msg=' . urlencode( sprintf( __( "You are about to delete the site %s" ), $blogname ) ) . '">' . __("Delete") . '</a>'; 525 525 526 526 $actions[] = "<a href='" . get_home_url($blog['blog_id']) . "' rel='permalink'>" . __('Visit') . '</a>'; -
trunk/wp-admin/ms-users.php
r13301 r13379 126 126 127 127 <?php if ( isset($_GET['s']) && $_GET['s'] != '' ) : ?> 128 <p><a href="ms-sites.php?action=blogs&s=<?php echo urlencode( stripslashes( $s ) ); ?>&blog_name=Search+blogs+by+name"><?php _e('Search Blogs for') ?> <strong><?php echo stripslashes( $s ) ?></strong></a></p>128 <p><a href="ms-sites.php?action=blogs&s=<?php echo urlencode( stripslashes( $s ) ); ?>&blog_name=Search+blogs+by+name"><?php _e('Search Sites for') ?> <strong><?php echo stripslashes( $s ) ?></strong></a></p> 129 129 <?php endif; ?> 130 130 … … 146 146 <?php foreach( (array) $posts_columns as $column_id => $column_display_name) { 147 147 if ( $column_id == 'blogs' ) { 148 echo '<th scope="col">'.__(' Blogs').'</th>';148 echo '<th scope="col">'.__('Sites').'</th>'; 149 149 } elseif ( $column_id == 'checkbox') { 150 150 echo '<th scope="col" class="check-column"><input type="checkbox" /></th>';
Note: See TracChangeset
for help on using the changeset viewer.