WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

s/blog/site/ in even more places. props PeteMall, see #11644. 

git-svn-id: http://svn.automattic.com/wordpress/trunk@14315 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
nacin 2010-04-30 03:17:49 +00:00
parent 21179d5625
commit e64a657575
22 changed files with 74 additions and 74 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
wp-admin/custom-header.php
View File

@ -414,7 +414,7 @@ else:
endif; endif;
?> ?>
<div class="wrap"> <div class="wrap">
<h3><?php _e('Upload New Header Image'); ?></h3><p><?php _e('Here you can upload a custom header image to be shown at the top of your blog instead of the default one. On the next screen you will be able to crop the image.'); ?> <?php printf(__('Images of exactly <strong>%1$d x %2$d pixels</strong> will be used as-is.'), HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT); ?></p> <h3><?php _e('Upload New Header Image'); ?></h3><p><?php _e('Here you can upload a custom header image to be shown at the top of your site instead of the default one. On the next screen you will be able to crop the image.'); ?> <?php printf(__('Images of exactly <strong>%1$d x %2$d pixels</strong> will be used as-is.'), HEADER_IMAGE_WIDTH, HEADER_IMAGE_HEIGHT); ?></p>
<form enctype="multipart/form-data" id="uploadForm" method="POST" action="<?php echo esc_attr(add_query_arg('step', 2)) ?>"> <form enctype="multipart/form-data" id="uploadForm" method="POST" action="<?php echo esc_attr(add_query_arg('step', 2)) ?>">
<label for="upload"><?php _e('Choose an image from your computer:'); ?></label><br /><input type="file" id="upload" name="import" /> <label for="upload"><?php _e('Choose an image from your computer:'); ?></label><br /><input type="file" id="upload" name="import" />

2
wp-admin/import/blogger.php
View File

@ -48,7 +48,7 @@ class Blogger_Import {
$next_url = get_option('siteurl') . '/wp-admin/index.php?import=blogger&amp;noheader=true'; $next_url = get_option('siteurl') . '/wp-admin/index.php?import=blogger&amp;noheader=true';
$auth_url = "https://www.google.com/accounts/AuthSubRequest"; $auth_url = "https://www.google.com/accounts/AuthSubRequest";
$title = __('Import Blogger'); $title = __('Import Blogger');
$welcome = __('Howdy! This importer allows you to import posts and comments from your Blogger account into your WordPress blog.'); $welcome = __('Howdy! This importer allows you to import posts and comments from your Blogger account into your WordPress site.');
$prereqs = __('To use this importer, you must have a Google account and an upgraded (New, was Beta) blog hosted on blogspot.com or a custom domain (not FTP).'); $prereqs = __('To use this importer, you must have a Google account and an upgraded (New, was Beta) blog hosted on blogspot.com or a custom domain (not FTP).');
$stepone = __('The first thing you need to do is tell Blogger to let WordPress access your account. You will be sent back here after providing authorization.'); $stepone = __('The first thing you need to do is tell Blogger to let WordPress access your account. You will be sent back here after providing authorization.');
$auth = esc_attr__('Authorize'); $auth = esc_attr__('Authorize');

2
wp-admin/import/dotclear.php
View File

@ -100,7 +100,7 @@ class Dotclear_Import {
function greet() function greet()
{ {
echo '<div class="narrow"><p>'.__('Howdy! This importer allows you to extract posts from a DotClear database into your blog. Mileage may vary.').'</p>'; echo '<div class="narrow"><p>'.__('Howdy! This importer allows you to extract posts from a DotClear database into your WordPress site. Mileage may vary.').'</p>';
echo '<p>'.__('Your DotClear Configuration settings are as follows:').'</p>'; echo '<p>'.__('Your DotClear Configuration settings are as follows:').'</p>';
echo '<form action="admin.php?import=dotclear&amp;step=1" method="post">'; echo '<form action="admin.php?import=dotclear&amp;step=1" method="post">';
wp_nonce_field('import-dotclear'); wp_nonce_field('import-dotclear');

2
wp-admin/import/rss.php
View File

@ -32,7 +32,7 @@ class RSS_Import {
function greet() { function greet() {
echo '<div class="narrow">'; echo '<div class="narrow">';
echo '<p>'.__('Howdy! This importer allows you to extract posts from an RSS 2.0 file into your blog. This is useful if you want to import your posts from a system that is not handled by a custom import tool. Pick an RSS file to upload and click Import.').'</p>'; echo '<p>'.__('Howdy! This importer allows you to extract posts from an RSS 2.0 file into your WordPress site. This is useful if you want to import your posts from a system that is not handled by a custom import tool. Pick an RSS file to upload and click Import.').'</p>';
wp_import_upload_form("admin.php?import=rss&amp;step=1"); wp_import_upload_form("admin.php?import=rss&amp;step=1");
echo '</div>'; echo '</div>';
} }

2
wp-admin/import/wordpress.php
View File

@ -45,7 +45,7 @@ class WP_Import {
function greet() { function greet() {
echo '<div class="narrow">'; echo '<div class="narrow">';
echo '<p>'.__('Howdy! Upload your WordPress eXtended RSS (WXR) file and we&#8217;ll import the posts, pages, comments, custom fields, categories, and tags into this blog.').'</p>'; echo '<p>'.__('Howdy! Upload your WordPress eXtended RSS (WXR) file and we&#8217;ll import the posts, pages, comments, custom fields, categories, and tags into this site.').'</p>';
echo '<p>'.__('Choose a WordPress WXR file to upload, then click Upload file and import.').'</p>'; echo '<p>'.__('Choose a WordPress WXR file to upload, then click Upload file and import.').'</p>';
wp_import_upload_form("admin.php?import=wordpress&amp;step=1"); wp_import_upload_form("admin.php?import=wordpress&amp;step=1");
echo '</div>'; echo '</div>';

2
wp-admin/includes/meta-boxes.php
View File

@ -366,7 +366,7 @@ function post_trackback_meta_box($post) {
?> ?>
<p><label for="trackback_url"><?php _e('Send trackbacks to:'); ?></label> <?php echo $form_trackback; ?><br /> (<?php _e('Separate multiple URLs with spaces'); ?>)</p> <p><label for="trackback_url"><?php _e('Send trackbacks to:'); ?></label> <?php echo $form_trackback; ?><br /> (<?php _e('Separate multiple URLs with spaces'); ?>)</p>
<p><?php _e('Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. If you link other WordPress blogs they&#8217;ll be notified automatically using <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">pingbacks</a>, no other action necessary.'); ?></p> <p><?php _e('Trackbacks are a way to notify legacy blog systems that you&#8217;ve linked to them. If you link other WordPress sites they&#8217;ll be notified automatically using <a href="http://codex.wordpress.org/Introduction_to_Blogging#Managing_Comments" target="_blank">pingbacks</a>, no other action necessary.'); ?></p>
<?php <?php
if ( ! empty($pings) ) if ( ! empty($pings) )
echo $pings; echo $pings;

6
wp-admin/includes/plugin.php
View File

@ -373,9 +373,9 @@ function _get_dropins() {
if ( is_multisite() ) { if ( is_multisite() ) {
$dropins['sunrise.php' ] = array( __( 'Executed before Multisite is loaded.' ), 'SUNRISE' ); // SUNRISE $dropins['sunrise.php' ] = array( __( 'Executed before Multisite is loaded.' ), 'SUNRISE' ); // SUNRISE
$dropins['blog-deleted.php' ] = array( __( 'Custom blog deleted message.' ), true ); // auto on deleted blog $dropins['blog-deleted.php' ] = array( __( 'Custom site deleted message.' ), true ); // auto on deleted blog
$dropins['blog-inactive.php' ] = array( __( 'Custom blog inactive message.' ), true ); // auto on inactive blog $dropins['blog-inactive.php' ] = array( __( 'Custom site inactive message.' ), true ); // auto on inactive blog
$dropins['blog-suspended.php'] = array( __( 'Custom blog suspended message.' ), true ); // auto on archived or spammed blog $dropins['blog-suspended.php'] = array( __( 'Custom site suspended message.' ), true ); // auto on archived or spammed blog
} }
return $dropins; return $dropins;

4
wp-admin/includes/post.php
View File

@ -486,9 +486,9 @@ function wp_write_post() {
if ( !current_user_can( $ptype->edit_type_cap ) ) { if ( !current_user_can( $ptype->edit_type_cap ) ) {
if ( 'page' == $ptype->name ) if ( 'page' == $ptype->name )
return new WP_Error( 'edit_pages', __( 'You are not allowed to create pages on this blog.' ) ); return new WP_Error( 'edit_pages', __( 'You are not allowed to create pages on this site.' ) );
else else
return new WP_Error( 'edit_posts', __( 'You are not allowed to create posts or drafts on this blog.' ) ); return new WP_Error( 'edit_posts', __( 'You are not allowed to create posts or drafts on this site.' ) );
} }
// Check for autosave collisions // Check for autosave collisions

2
wp-admin/includes/schema.php
View File

@ -197,7 +197,7 @@ function populate_options() {
$options = array( $options = array(
'siteurl' => $guessurl, 'siteurl' => $guessurl,
'blogname' => __('My Blog'), 'blogname' => __('My Site'),
/* translators: blog tagline */ /* translators: blog tagline */
'blogdescription' => __('Just another WordPress site'), 'blogdescription' => __('Just another WordPress site'),
'users_can_register' => 0, 'users_can_register' => 0,

4
wp-admin/includes/upgrade.php
View File

@ -311,7 +311,7 @@ function wp_new_blog_notification($blog_title, $blog_url, $user_id, $password) {
$user = new WP_User($user_id); $user = new WP_User($user_id);
$email = $user->user_email; $email = $user->user_email;
$name = $user->user_login; $name = $user->user_login;
$message = sprintf(__("Your new WordPress blog has been successfully set up at: $message = sprintf(__("Your new WordPress site has been successfully set up at:
%1\$s %1\$s
@ -326,7 +326,7 @@ We hope you enjoy your new blog. Thanks!
http://wordpress.org/ http://wordpress.org/
"), $blog_url, $name, $password); "), $blog_url, $name, $password);
@wp_mail($email, __('New WordPress Blog'), $message); @wp_mail($email, __('New WordPress Site'), $message);
} }
endif; endif;

4
wp-admin/install.php
View File

@ -94,7 +94,7 @@ function display_setup_form( $error = null ) {
<form id="setup" method="post" action="install.php?step=2"> <form id="setup" method="post" action="install.php?step=2">
<table class="form-table"> <table class="form-table">
<tr> <tr>
<th scope="row"><label for="weblog_title"><?php _e( 'Blog Title' ); ?></label></th> <th scope="row"><label for="weblog_title"><?php _e( 'Site Title' ); ?></label></th>
<td><input name="weblog_title" type="text" id="weblog_title" size="25" value="<?php echo esc_attr( $weblog_title ); ?>" /></td> <td><input name="weblog_title" type="text" id="weblog_title" size="25" value="<?php echo esc_attr( $weblog_title ); ?>" /></td>
</tr> </tr>
<tr> <tr>
@ -130,7 +130,7 @@ function display_setup_form( $error = null ) {
<p><?php _e( 'Double-check your email address before continuing.' ); ?></p></td> <p><?php _e( 'Double-check your email address before continuing.' ); ?></p></td>
</tr> </tr>
<tr> <tr>
<td colspan="2"><label><input type="checkbox" name="blog_public" value="1" <?php checked( $blog_public ); ?> /> <?php _e( 'Allow my blog to appear in search engines like Google and Technorati.' ); ?></label></td> <td colspan="2"><label><input type="checkbox" name="blog_public" value="1" <?php checked( $blog_public ); ?> /> <?php _e( 'Allow my site to appear in search engines like Google and Technorati.' ); ?></label></td>
</tr> </tr>
</table> </table>
<p class="step"><input type="submit" name="Submit" value="<?php esc_attr_e( 'Install WordPress' ); ?>" class="button" /></p> <p class="step"><input type="submit" name="Submit" value="<?php esc_attr_e( 'Install WordPress' ); ?>" class="button" /></p>

2
wp-admin/ms-sites.php
View File

@ -647,7 +647,7 @@ switch ( $action ) {
} }
} else { ?> } else { ?>
<tr> <tr>
<td colspan="<?php echo (int) count( $sites_columns ); ?>"><?php _e( 'No blogs found.' ) ?></td> <td colspan="<?php echo (int) count( $sites_columns ); ?>"><?php _e( 'No sites found.' ) ?></td>
</tr> </tr>
<?php <?php
} // end if ($blogs) } // end if ($blogs)

2
wp-admin/tools.php
View File

@ -23,7 +23,7 @@ require_once('./admin-header.php');
<h3 class="title"><?php _e('Press This') ?></h3> <h3 class="title"><?php _e('Press This') ?></h3>
<p><?php _e('Press This is a bookmarklet: a little app that runs in your browser and lets you grab bits of the web.');?></p> <p><?php _e('Press This is a bookmarklet: a little app that runs in your browser and lets you grab bits of the web.');?></p>
<p><?php _e('Use Press This to clip text, images and videos from any web page. Then edit and add more straight from Press This before you save or publish it in a post on your blog.'); ?></p> <p><?php _e('Use Press This to clip text, images and videos from any web page. Then edit and add more straight from Press This before you save or publish it in a post on your site.'); ?></p>
<p><?php _e('Drag-and-drop the following link to your bookmarks bar or right click it and add it to your favorites for a posting shortcut.') ?></p> <p><?php _e('Drag-and-drop the following link to your bookmarks bar or right click it and add it to your favorites for a posting shortcut.') ?></p>
<p class="pressthis"><a href="<?php echo htmlspecialchars( get_shortcut_link() ); ?>" title="<?php echo esc_attr(__('Press This')) ?>"><?php _e('Press This') ?></a></p> <p class="pressthis"><a href="<?php echo htmlspecialchars( get_shortcut_link() ); ?>" title="<?php echo esc_attr(__('Press This')) ?>"><?php _e('Press This') ?></a></p>
</div> </div>

4
wp-admin/user-edit.php
View File

@ -223,9 +223,9 @@ wp_dropdown_roles($user_role);
// print the 'no role' option. Make it selected if the user has no role yet. // print the 'no role' option. Make it selected if the user has no role yet.
if ( $user_role ) if ( $user_role )
echo '<option value="">' . __('&mdash; No role for this blog &mdash;') . '</option>'; echo '<option value="">' . __('&mdash; No role for this site &mdash;') . '</option>';
else else
echo '<option value="" selected="selected">' . __('&mdash; No role for this blog &mdash;') . '</option>'; echo '<option value="" selected="selected">' . __('&mdash; No role for this site &mdash;') . '</option>';
?> ?>
</select> </select>
<?php if ( is_multisite() && current_user_can( 'manage_network_options' ) && !isset($super_admins) ) { ?> <?php if ( is_multisite() && current_user_can( 'manage_network_options' ) && !isset($super_admins) ) { ?>

4
wp-admin/user-new.php
View File

@ -32,7 +32,7 @@ Please click the following link to activate your user account:
add_filter( 'wpmu_signup_user_notification_email', 'admin_created_user_email' ); add_filter( 'wpmu_signup_user_notification_email', 'admin_created_user_email' );
function admin_created_user_subject( $text ) { function admin_created_user_subject( $text ) {
return "[" . get_bloginfo('name') . "] Your blog invite"; return "[" . get_bloginfo('name') . "] Your site invite";
} }
} }
@ -174,7 +174,7 @@ if ( !is_multisite() ) {
else else
echo '<p>' . sprintf(__('Users cannot currently <a href="%1$s">register themselves</a>, but you can manually create users here.'), admin_url('options-general.php#users_can_register')) . '</p>'; echo '<p>' . sprintf(__('Users cannot currently <a href="%1$s">register themselves</a>, but you can manually create users here.'), admin_url('options-general.php#users_can_register')) . '</p>';
} else { } else {
echo '<p>' . __( 'You can add new users to your blog in two ways:' ) . '<ol><li> ' . __( 'Enter the username and email address of an existing user on this site.' ) . '</li><li> ' . __( 'Enter the username and the email address of a person who is not already a member of this site. Choose the username carefully, it cannot be changed.' ) . '</li></ol></p>'; echo '<p>' . __( 'You can add new users to your site in two ways:' ) . '<ol><li> ' . __( 'Enter the username and email address of an existing user on this site.' ) . '</li><li> ' . __( 'Enter the username and the email address of a person who is not already a member of this site. Choose the username carefully, it cannot be changed.' ) . '</li></ol></p>';
echo '<p>' . __( 'That person will be sent an email asking them to click a link confirming the invite. New users will then be sent an email with a randomly generated password and a login link.' ) . '</p>'; echo '<p>' . __( 'That person will be sent an email asking them to click a link confirming the invite. New users will then be sent an email with a randomly generated password and a login link.' ) . '</p>';
} }
?> ?>

4
wp-admin/users.php
View File

@ -249,7 +249,7 @@ case 'remove':
<div class="wrap"> <div class="wrap">
<?php screen_icon(); ?> <?php screen_icon(); ?>
<h2><?php _e('Remove Users from Blog'); ?></h2> <h2><?php _e('Remove Users from Site'); ?></h2>
<p><?php _e('You have specified these users for removal:'); ?></p> <p><?php _e('You have specified these users for removal:'); ?></p>
<ul> <ul>
<?php <?php
@ -324,7 +324,7 @@ default:
$messages[] = '<div id="message" class="updated"><p>' . __('Other users have been deleted.') . '</p></div>'; $messages[] = '<div id="message" class="updated"><p>' . __('Other users have been deleted.') . '</p></div>';
break; break;
case 'remove': case 'remove':
$messages[] = '<div id="message" class="updated fade"><p>' . __('User removed from this blog.') . '</p></div>'; $messages[] = '<div id="message" class="updated fade"><p>' . __('User removed from this site.') . '</p></div>';
break; break;
case 'err_admin_remove': case 'err_admin_remove':
$messages[] = '<div id="message" class="error"><p>' . __("You can't remove the current user.") . '</p></div>'; $messages[] = '<div id="message" class="error"><p>' . __("You can't remove the current user.") . '</p></div>';

6
wp-app.php
View File

@ -284,7 +284,7 @@ class AtomServer {
// check to see if AtomPub is enabled // check to see if AtomPub is enabled
if ( !get_option( 'enable_app' ) ) if ( !get_option( 'enable_app' ) )
$this->forbidden( sprintf( __( 'AtomPub services are disabled on this blog. An admin user can enable them at %s' ), admin_url('options-writing.php') ) ); $this->forbidden( sprintf( __( 'AtomPub services are disabled on this site. An admin user can enable them at %s' ), admin_url('options-writing.php') ) );
// dispatch // dispatch
foreach ( $this->selectors as $regex => $funcs ) { foreach ( $this->selectors as $regex => $funcs ) {
@ -321,7 +321,7 @@ class AtomServer {
log_app('function','get_service()'); log_app('function','get_service()');
if ( !current_user_can( 'edit_posts' ) ) if ( !current_user_can( 'edit_posts' ) )
$this->auth_required( __( 'Sorry, you do not have the right to access this blog.' ) ); $this->auth_required( __( 'Sorry, you do not have the right to access this site.' ) );
$entries_url = esc_attr($this->get_entries_url()); $entries_url = esc_attr($this->get_entries_url());
$categories_url = esc_attr($this->get_categories_url()); $categories_url = esc_attr($this->get_categories_url());
@ -362,7 +362,7 @@ EOD;
log_app('function','get_categories_xml()'); log_app('function','get_categories_xml()');
if ( !current_user_can( 'edit_posts' ) ) if ( !current_user_can( 'edit_posts' ) )
$this->auth_required( __( 'Sorry, you do not have the right to access this blog.' ) ); $this->auth_required( __( 'Sorry, you do not have the right to access this site.' ) );
$home = esc_attr(get_bloginfo_rss('url')); $home = esc_attr(get_bloginfo_rss('url'));

8
wp-includes/default-widgets.php
View File

@ -172,7 +172,7 @@ class WP_Widget_Links extends WP_Widget {
class WP_Widget_Search extends WP_Widget { class WP_Widget_Search extends WP_Widget {
function WP_Widget_Search() { function WP_Widget_Search() {
$widget_ops = array('classname' => 'widget_search', 'description' => __( "A search form for your blog") ); $widget_ops = array('classname' => 'widget_search', 'description' => __( "A search form for your site") );
$this->WP_Widget('search', __('Search'), $widget_ops); $this->WP_Widget('search', __('Search'), $widget_ops);
} }
@ -215,7 +215,7 @@ class WP_Widget_Search extends WP_Widget {
class WP_Widget_Archives extends WP_Widget { class WP_Widget_Archives extends WP_Widget {
function WP_Widget_Archives() { function WP_Widget_Archives() {
$widget_ops = array('classname' => 'widget_archive', 'description' => __( 'A monthly archive of your blog&#8217;s posts') ); $widget_ops = array('classname' => 'widget_archive', 'description' => __( 'A monthly archive of your site&#8217;s posts') );
$this->WP_Widget('archives', __('Archives'), $widget_ops); $this->WP_Widget('archives', __('Archives'), $widget_ops);
} }
@ -328,7 +328,7 @@ class WP_Widget_Meta extends WP_Widget {
class WP_Widget_Calendar extends WP_Widget { class WP_Widget_Calendar extends WP_Widget {
function WP_Widget_Calendar() { function WP_Widget_Calendar() {
$widget_ops = array('classname' => 'widget_calendar', 'description' => __( 'A calendar of your blog&#8217;s posts') ); $widget_ops = array('classname' => 'widget_calendar', 'description' => __( 'A calendar of your site&#8217;s posts') );
$this->WP_Widget('calendar', __('Calendar'), $widget_ops); $this->WP_Widget('calendar', __('Calendar'), $widget_ops);
} }
@ -511,7 +511,7 @@ class WP_Widget_Categories extends WP_Widget {
class WP_Widget_Recent_Posts extends WP_Widget { class WP_Widget_Recent_Posts extends WP_Widget {
function WP_Widget_Recent_Posts() { function WP_Widget_Recent_Posts() {
$widget_ops = array('classname' => 'widget_recent_entries', 'description' => __( "The most recent posts on your blog") ); $widget_ops = array('classname' => 'widget_recent_entries', 'description' => __( "The most recent posts on your site") );
$this->WP_Widget('recent-posts', __('Recent Posts'), $widget_ops); $this->WP_Widget('recent-posts', __('Recent Posts'), $widget_ops);
$this->alt_option_name = 'widget_recent_entries'; $this->alt_option_name = 'widget_recent_entries';

36
wp-includes/ms-functions.php
View File

@ -322,14 +322,14 @@ function create_empty_blog( $domain, $path, $weblog_title, $site_id = 1 ) {
// Check if the domain has been used already. We should return an error message. // Check if the domain has been used already. We should return an error message.
if ( domain_exists($domain, $path, $site_id) ) if ( domain_exists($domain, $path, $site_id) )
return __( 'Error: Blog URL already taken.' ); return __( 'Error: Site URL already taken.' );
// Need to backup wpdb table names, and create a new wp_blogs entry for new blog. // Need to backup wpdb table names, and create a new wp_blogs entry for new blog.
// Need to get blog_id from wp_blogs, and create new table names. // Need to get blog_id from wp_blogs, and create new table names.
// Must restore table names at the end of function. // Must restore table names at the end of function.
if ( ! $blog_id = insert_blog($domain, $path, $site_id) ) if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
return __( 'Error: problem creating blog entry.' ); return __( 'Error: problem creating site entry.' );
switch_to_blog($blog_id); switch_to_blog($blog_id);
install_blog($blog_id); install_blog($blog_id);
@ -557,7 +557,7 @@ function wpmu_validate_blog_signup($blogname, $blog_title, $user = '') {
} }
if ( empty( $blogname ) ) if ( empty( $blogname ) )
$errors->add('blogname', __('Please enter a blog name')); $errors->add('blogname', __('Please enter a site name'));
$maybe = array(); $maybe = array();
preg_match( '/[a-z0-9]+/', $blogname, $maybe ); preg_match( '/[a-z0-9]+/', $blogname, $maybe );
@ -568,27 +568,27 @@ function wpmu_validate_blog_signup($blogname, $blog_title, $user = '') {
$errors->add('blogname', __('That name is not allowed')); $errors->add('blogname', __('That name is not allowed'));
if ( strlen( $blogname ) < 4 && !is_super_admin() ) if ( strlen( $blogname ) < 4 && !is_super_admin() )
$errors->add('blogname', __('Blog name must be at least 4 characters')); $errors->add('blogname', __('Site name must be at least 4 characters'));
if ( strpos( ' ' . $blogname, '_' ) != false ) if ( strpos( ' ' . $blogname, '_' ) != false )
$errors->add( 'blogname', __( 'Sorry, blog names may not contain the character &#8220;_&#8221;!' ) ); $errors->add( 'blogname', __( 'Sorry, site names may not contain the character &#8220;_&#8221;!' ) );
// do not allow users to create a blog that conflicts with a page on the main blog. // do not allow users to create a blog that conflicts with a page on the main blog.
if ( !is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_site->blog_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) ) if ( !is_subdomain_install() && $wpdb->get_var( $wpdb->prepare( "SELECT post_name FROM " . $wpdb->get_blog_prefix( $current_site->blog_id ) . "posts WHERE post_type = 'page' AND post_name = %s", $blogname ) ) )
$errors->add( 'blogname', __( 'Sorry, you may not use that blog name.' ) ); $errors->add( 'blogname', __( 'Sorry, you may not use that site name.' ) );
// all numeric? // all numeric?
$match = array(); $match = array();
preg_match( '/[0-9]*/', $blogname, $match ); preg_match( '/[0-9]*/', $blogname, $match );
if ( $match[0] == $blogname ) if ( $match[0] == $blogname )
$errors->add('blogname', __('Sorry, blog names must have letters too!')); $errors->add('blogname', __('Sorry, site names must have letters too!'));
$blogname = apply_filters( 'newblogname', $blogname ); $blogname = apply_filters( 'newblogname', $blogname );
$blog_title = stripslashes( $blog_title ); $blog_title = stripslashes( $blog_title );
if ( empty( $blog_title ) ) if ( empty( $blog_title ) )
$errors->add('blog_title', __('Please enter a blog title')); $errors->add('blog_title', __('Please enter a site title'));
// Check if the domain/path has been used already. // Check if the domain/path has been used already.
if ( is_subdomain_install() ) { if ( is_subdomain_install() ) {
@ -599,11 +599,11 @@ function wpmu_validate_blog_signup($blogname, $blog_title, $user = '') {
$path = $base.$blogname.'/'; $path = $base.$blogname.'/';
} }
if ( domain_exists($mydomain, $path) ) if ( domain_exists($mydomain, $path) )
$errors->add('blogname', __('Sorry, that blog already exists!')); $errors->add('blogname', __('Sorry, that site already exists!'));
if ( username_exists( $blogname ) ) { if ( username_exists( $blogname ) ) {
if ( is_object( $user ) == false || ( is_object($user) && ( $user->user_login != $blogname ) ) ) if ( is_object( $user ) == false || ( is_object($user) && ( $user->user_login != $blogname ) ) )
$errors->add( 'blogname', __( 'Sorry, that blog is reserved!' ) ); $errors->add( 'blogname', __( 'Sorry, that site is reserved!' ) );
} }
// Has someone already signed up for this domain? // Has someone already signed up for this domain?
@ -614,7 +614,7 @@ function wpmu_validate_blog_signup($blogname, $blog_title, $user = '') {
if ( $diff > 172800 ) if ( $diff > 172800 )
$wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->signups WHERE domain = %s AND path = %s", $mydomain, $path) ); $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->signups WHERE domain = %s AND path = %s", $mydomain, $path) );
else else
$errors->add('blogname', __('That blog is currently reserved but may be available in a couple days.')); $errors->add('blogname', __('That site is currently reserved but may be available in a couple days.'));
} }
$result = array('domain' => $mydomain, 'path' => $path, 'blogname' => $blogname, 'blog_title' => $blog_title, 'errors' => $errors); $result = array('domain' => $mydomain, 'path' => $path, 'blogname' => $blogname, 'blog_title' => $blog_title, 'errors' => $errors);
@ -688,7 +688,7 @@ function wpmu_signup_blog_notification($domain, $path, $title, $user, $user_emai
$admin_email = 'support@' . $_SERVER['SERVER_NAME']; $admin_email = 'support@' . $_SERVER['SERVER_NAME'];
$from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) ); $from_name = get_site_option( 'site_name' ) == '' ? 'WordPress' : esc_html( get_site_option( 'site_name' ) );
$message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n"; $message_headers = "From: \"{$from_name}\" <{$admin_email}>\n" . "Content-Type: text/plain; charset=\"" . get_option('blog_charset') . "\"\n";
$message = sprintf( apply_filters( 'wpmu_signup_blog_notification_email', __( "To activate your blog, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your blog here:\n\n%s" ) ), $activate_url, esc_url( "http://{$domain}{$path}" ), $key ); $message = sprintf( apply_filters( 'wpmu_signup_blog_notification_email', __( "To activate your blog, please click the following link:\n\n%s\n\nAfter you activate, you will receive *another email* with your login.\n\nAfter you activate, you can visit your site here:\n\n%s" ) ), $activate_url, esc_url( "http://{$domain}{$path}" ), $key );
// TODO: Don't hard code activation link. // TODO: Don't hard code activation link.
$subject = sprintf( apply_filters( 'wpmu_signup_blog_notification_subject', __( '[%1s] Activate %2s' ) ), $from_name, esc_url( 'http://' . $domain . $path ) ); $subject = sprintf( apply_filters( 'wpmu_signup_blog_notification_subject', __( '[%1s] Activate %2s' ) ), $from_name, esc_url( 'http://' . $domain . $path ) );
wp_mail($user_email, $subject, $message, $message_headers); wp_mail($user_email, $subject, $message, $message_headers);
@ -721,7 +721,7 @@ function wpmu_activate_signup($key) {
return new WP_Error('invalid_key', __('Invalid activation key.')); return new WP_Error('invalid_key', __('Invalid activation key.'));
if ( $signup->active ) if ( $signup->active )
return new WP_Error('already_active', __('The blog is already active.'), $signup); return new WP_Error('already_active', __('The site is already active.'), $signup);
$meta = unserialize($signup->meta); $meta = unserialize($signup->meta);
$user_login = $wpdb->escape($signup->user_login); $user_login = $wpdb->escape($signup->user_login);
@ -811,13 +811,13 @@ function wpmu_create_blog($domain, $path, $title, $user_id, $meta = '', $site_id
// Check if the domain has been used already. We should return an error message. // Check if the domain has been used already. We should return an error message.
if ( domain_exists($domain, $path, $site_id) ) if ( domain_exists($domain, $path, $site_id) )
return new WP_Error('blog_taken', __('Blog already exists.')); return new WP_Error('blog_taken', __('Site already exists.'));
if ( !defined('WP_INSTALLING') ) if ( !defined('WP_INSTALLING') )
define( 'WP_INSTALLING', true ); define( 'WP_INSTALLING', true );
if ( ! $blog_id = insert_blog($domain, $path, $site_id) ) if ( ! $blog_id = insert_blog($domain, $path, $site_id) )
return new WP_Error('insert_blog', __('Could not create blog.')); return new WP_Error('insert_blog', __('Could not create site.'));
switch_to_blog($blog_id); switch_to_blog($blog_id);
install_blog($blog_id, $title); install_blog($blog_id, $title);
@ -859,14 +859,14 @@ function newblog_notify_siteadmin( $blog_id, $deprecated = '' ) {
$siteurl = site_url(); $siteurl = site_url();
restore_current_blog(); restore_current_blog();
$msg = sprintf( __( 'New Blog: %1s $msg = sprintf( __( 'New Site: %1s
URL: %2s URL: %2s
Remote IP: %3s Remote IP: %3s
Disable these notifications: %4s' ), $blogname, $siteurl, $_SERVER['REMOTE_ADDR'], $options_site_url); Disable these notifications: %4s' ), $blogname, $siteurl, $_SERVER['REMOTE_ADDR'], $options_site_url);
$msg = apply_filters( 'newblog_notify_siteadmin', $msg ); $msg = apply_filters( 'newblog_notify_siteadmin', $msg );
wp_mail( $email, sprintf( __( 'New Blog Registration: %s' ), $siteurl ), $msg ); wp_mail( $email, sprintf( __( 'New Site Registration: %s' ), $siteurl ), $msg );
return true; return true;
} }
@ -1009,7 +1009,7 @@ Thanks!
if ( empty( $current_site->site_name ) ) if ( empty( $current_site->site_name ) )
$current_site->site_name = 'WordPress MU'; $current_site->site_name = 'WordPress MU';
$subject = apply_filters( 'update_welcome_subject', sprintf(__('New %1$s Blog: %2$s'), $current_site->site_name, stripslashes( $title ) ) ); $subject = apply_filters( 'update_welcome_subject', sprintf(__('New %1$s Site: %2$s'), $current_site->site_name, stripslashes( $title ) ) );
wp_mail($user->user_email, $subject, $message, $message_headers); wp_mail($user->user_email, $subject, $message, $message_headers);
return true; return true;
} }

2
wp-includes/pluggable.php
View File

@ -1197,7 +1197,7 @@ function wp_new_user_notification($user_id, $plaintext_pass = '') {
// we want to reverse this for the plain text arena of emails. // we want to reverse this for the plain text arena of emails.
$blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES); $blogname = wp_specialchars_decode(get_option('blogname'), ENT_QUOTES);
$message = sprintf(__('New user registration on your blog %s:'), $blogname) . "\r\n\r\n"; $message = sprintf(__('New user registration on your site %s:'), $blogname) . "\r\n\r\n";
$message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n"; $message .= sprintf(__('Username: %s'), $user_login) . "\r\n\r\n";
$message .= sprintf(__('E-mail: %s'), $user_email) . "\r\n"; $message .= sprintf(__('E-mail: %s'), $user_email) . "\r\n";

2
wp-includes/user.php
View File

@ -97,7 +97,7 @@ function wp_authenticate_username_password($user, $username, $password) {
if ( !is_super_admin( $userdata->ID ) && isset($userdata->primary_blog) ) { if ( !is_super_admin( $userdata->ID ) && isset($userdata->primary_blog) ) {
$details = get_blog_details( $userdata->primary_blog ); $details = get_blog_details( $userdata->primary_blog );
if ( is_object( $details ) && $details->spam == 1 ) if ( is_object( $details ) && $details->spam == 1 )
return new WP_Error('blog_suspended', __('Blog Suspended.')); return new WP_Error('blog_suspended', __('Site Suspended.'));
} }
} }

46
xmlrpc.php
View File

@ -246,7 +246,7 @@ class wp_xmlrpc_server extends IXR_Server {
*/ */
function login_pass_ok($user_login, $user_pass) { function login_pass_ok($user_login, $user_pass) {
if ( !get_option( 'enable_xmlrpc' ) ) { if ( !get_option( 'enable_xmlrpc' ) ) {
$this->error = new IXR_Error( 405, sprintf( __( 'XML-RPC services are disabled on this blog. An admin user can enable them at %s'), admin_url('options-writing.php') ) ); $this->error = new IXR_Error( 405, sprintf( __( 'XML-RPC services are disabled on this site. An admin user can enable them at %s'), admin_url('options-writing.php') ) );
return false; return false;
} }
@ -268,7 +268,7 @@ class wp_xmlrpc_server extends IXR_Server {
*/ */
function login($username, $password) { function login($username, $password) {
if ( !get_option( 'enable_xmlrpc' ) ) { if ( !get_option( 'enable_xmlrpc' ) ) {
$this->error = new IXR_Error( 405, sprintf( __( 'XML-RPC services are disabled on this blog. An admin user can enable them at %s'), admin_url('options-writing.php') ) ); $this->error = new IXR_Error( 405, sprintf( __( 'XML-RPC services are disabled on this site. An admin user can enable them at %s'), admin_url('options-writing.php') ) );
return false; return false;
} }
@ -391,7 +391,7 @@ class wp_xmlrpc_server extends IXR_Server {
'value' => $wp_version 'value' => $wp_version
), ),
'blog_url' => array( 'blog_url' => array(
'desc' => __( 'Blog URL' ), 'desc' => __( 'Site URL' ),
'readonly' => true, 'readonly' => true,
'option' => 'siteurl' 'option' => 'siteurl'
), ),
@ -403,12 +403,12 @@ class wp_xmlrpc_server extends IXR_Server {
'option' => 'gmt_offset' 'option' => 'gmt_offset'
), ),
'blog_title' => array( 'blog_title' => array(
'desc' => __( 'Blog Title' ), 'desc' => __( 'Site Title' ),
'readonly' => false, 'readonly' => false,
'option' => 'blogname' 'option' => 'blogname'
), ),
'blog_tagline' => array( 'blog_tagline' => array(
'desc' => __( 'Blog Tagline' ), 'desc' => __( 'Site Tagline' ),
'readonly' => false, 'readonly' => false,
'option' => 'blogdescription' 'option' => 'blogdescription'
), ),
@ -830,7 +830,7 @@ class wp_xmlrpc_server extends IXR_Server {
return $this->error; return $this->error;
if ( !current_user_can("edit_posts") ) if ( !current_user_can("edit_posts") )
return(new IXR_Error(401, __("Sorry, you cannot edit posts on this blog."))); return(new IXR_Error(401, __("Sorry, you cannot edit posts on this site.")));
do_action('xmlrpc_call', 'wp.getAuthors'); do_action('xmlrpc_call', 'wp.getAuthors');
@ -865,7 +865,7 @@ class wp_xmlrpc_server extends IXR_Server {
return $this->error; return $this->error;
if ( !current_user_can( 'edit_posts' ) ) if ( !current_user_can( 'edit_posts' ) )
return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this blog in order to view tags.' ) ); return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view tags.' ) );
do_action( 'xmlrpc_call', 'wp.getKeywords' ); do_action( 'xmlrpc_call', 'wp.getKeywords' );
@ -988,7 +988,7 @@ class wp_xmlrpc_server extends IXR_Server {
return $this->error; return $this->error;
if ( !current_user_can( 'edit_posts' ) ) if ( !current_user_can( 'edit_posts' ) )
return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts to this blog in order to view categories.' ) ); return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts to this site in order to view categories.' ) );
do_action('xmlrpc_call', 'wp.suggestCategories'); do_action('xmlrpc_call', 'wp.suggestCategories');
@ -1024,7 +1024,7 @@ class wp_xmlrpc_server extends IXR_Server {
return $this->error; return $this->error;
if ( !current_user_can( 'moderate_comments' ) ) if ( !current_user_can( 'moderate_comments' ) )
return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this blog.' ) ); return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
do_action('xmlrpc_call', 'wp.getComment'); do_action('xmlrpc_call', 'wp.getComment');
@ -1146,7 +1146,7 @@ class wp_xmlrpc_server extends IXR_Server {
return $this->error; return $this->error;
if ( !current_user_can( 'moderate_comments' ) ) if ( !current_user_can( 'moderate_comments' ) )
return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this blog.' ) ); return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
do_action('xmlrpc_call', 'wp.deleteComment'); do_action('xmlrpc_call', 'wp.deleteComment');
@ -1177,7 +1177,7 @@ class wp_xmlrpc_server extends IXR_Server {
return $this->error; return $this->error;
if ( !current_user_can( 'moderate_comments' ) ) if ( !current_user_can( 'moderate_comments' ) )
return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this blog.' ) ); return new IXR_Error( 403, __( 'You are not allowed to moderate comments on this site.' ) );
do_action('xmlrpc_call', 'wp.editComment'); do_action('xmlrpc_call', 'wp.editComment');
@ -1327,7 +1327,7 @@ class wp_xmlrpc_server extends IXR_Server {
return $this->error; return $this->error;
if ( !current_user_can( 'moderate_comments' ) ) if ( !current_user_can( 'moderate_comments' ) )
return new IXR_Error( 403, __( 'You are not allowed access to details about this blog.' ) ); return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
do_action('xmlrpc_call', 'wp.getCommentStatusList'); do_action('xmlrpc_call', 'wp.getCommentStatusList');
@ -1386,7 +1386,7 @@ class wp_xmlrpc_server extends IXR_Server {
return $this->error; return $this->error;
if ( !current_user_can( 'edit_posts' ) ) if ( !current_user_can( 'edit_posts' ) )
return new IXR_Error( 403, __( 'You are not allowed access to details about this blog.' ) ); return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
do_action('xmlrpc_call', 'wp.getPostStatusList'); do_action('xmlrpc_call', 'wp.getPostStatusList');
@ -1412,7 +1412,7 @@ class wp_xmlrpc_server extends IXR_Server {
return $this->error; return $this->error;
if ( !current_user_can( 'edit_posts' ) ) if ( !current_user_can( 'edit_posts' ) )
return new IXR_Error( 403, __( 'You are not allowed access to details about this blog.' ) ); return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
do_action('xmlrpc_call', 'wp.getPageStatusList'); do_action('xmlrpc_call', 'wp.getPageStatusList');
@ -1438,7 +1438,7 @@ class wp_xmlrpc_server extends IXR_Server {
return $this->error; return $this->error;
if ( !current_user_can( 'edit_pages' ) ) if ( !current_user_can( 'edit_pages' ) )
return new IXR_Error( 403, __( 'You are not allowed access to details about this blog.' ) ); return new IXR_Error( 403, __( 'You are not allowed access to details about this site.' ) );
$templates = get_page_templates( ); $templates = get_page_templates( );
$templates['Default'] = 'default'; $templates['Default'] = 'default';
@ -1624,7 +1624,7 @@ class wp_xmlrpc_server extends IXR_Server {
return $this->error; return $this->error;
if ( !current_user_can( 'edit_posts' ) ) if ( !current_user_can( 'edit_posts' ) )
return new IXR_Error( 401, __( 'Sorry, you do not have access to user data on this blog.' ) ); return new IXR_Error( 401, __( 'Sorry, you do not have access to user data on this site.' ) );
do_action('xmlrpc_call', 'blogger.getUserInfo'); do_action('xmlrpc_call', 'blogger.getUserInfo');
@ -1842,7 +1842,7 @@ class wp_xmlrpc_server extends IXR_Server {
$cap = ($publish) ? 'publish_posts' : 'edit_posts'; $cap = ($publish) ? 'publish_posts' : 'edit_posts';
if ( !current_user_can($cap) ) if ( !current_user_can($cap) )
return new IXR_Error(401, __('Sorry, you are not allowed to post on this blog.')); return new IXR_Error(401, __('Sorry, you are not allowed to post on this site.'));
$post_status = ($publish) ? 'publish' : 'draft'; $post_status = ($publish) ? 'publish' : 'draft';
@ -1989,13 +1989,13 @@ class wp_xmlrpc_server extends IXR_Server {
do_action('xmlrpc_call', 'metaWeblog.newPost'); do_action('xmlrpc_call', 'metaWeblog.newPost');
$cap = ( $publish ) ? 'publish_posts' : 'edit_posts'; $cap = ( $publish ) ? 'publish_posts' : 'edit_posts';
$error_message = __( 'Sorry, you are not allowed to publish posts on this blog.' ); $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
$post_type = 'post'; $post_type = 'post';
$page_template = ''; $page_template = '';
if ( !empty( $content_struct['post_type'] ) ) { if ( !empty( $content_struct['post_type'] ) ) {
if ( $content_struct['post_type'] == 'page' ) { if ( $content_struct['post_type'] == 'page' ) {
$cap = ( $publish ) ? 'publish_pages' : 'edit_pages'; $cap = ( $publish ) ? 'publish_pages' : 'edit_pages';
$error_message = __( 'Sorry, you are not allowed to publish pages on this blog.' ); $error_message = __( 'Sorry, you are not allowed to publish pages on this site.' );
$post_type = 'page'; $post_type = 'page';
if ( !empty( $content_struct['wp_page_template'] ) ) if ( !empty( $content_struct['wp_page_template'] ) )
$page_template = $content_struct['wp_page_template']; $page_template = $content_struct['wp_page_template'];
@ -2264,13 +2264,13 @@ class wp_xmlrpc_server extends IXR_Server {
do_action('xmlrpc_call', 'metaWeblog.editPost'); do_action('xmlrpc_call', 'metaWeblog.editPost');
$cap = ( $publish ) ? 'publish_posts' : 'edit_posts'; $cap = ( $publish ) ? 'publish_posts' : 'edit_posts';
$error_message = __( 'Sorry, you are not allowed to publish posts on this blog.' ); $error_message = __( 'Sorry, you are not allowed to publish posts on this site.' );
$post_type = 'post'; $post_type = 'post';
$page_template = ''; $page_template = '';
if ( !empty( $content_struct['post_type'] ) ) { if ( !empty( $content_struct['post_type'] ) ) {
if ( $content_struct['post_type'] == 'page' ) { if ( $content_struct['post_type'] == 'page' ) {
$cap = ( $publish ) ? 'publish_pages' : 'edit_pages'; $cap = ( $publish ) ? 'publish_pages' : 'edit_pages';
$error_message = __( 'Sorry, you are not allowed to publish pages on this blog.' ); $error_message = __( 'Sorry, you are not allowed to publish pages on this site.' );
$post_type = 'page'; $post_type = 'page';
if ( !empty( $content_struct['wp_page_template'] ) ) if ( !empty( $content_struct['wp_page_template'] ) )
$page_template = $content_struct['wp_page_template']; $page_template = $content_struct['wp_page_template'];
@ -2720,7 +2720,7 @@ class wp_xmlrpc_server extends IXR_Server {
return $this->error; return $this->error;
if ( !current_user_can( 'edit_posts' ) ) if ( !current_user_can( 'edit_posts' ) )
return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this blog in order to view categories.' ) ); return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view categories.' ) );
do_action('xmlrpc_call', 'metaWeblog.getCategories'); do_action('xmlrpc_call', 'metaWeblog.getCategories');
@ -2908,7 +2908,7 @@ class wp_xmlrpc_server extends IXR_Server {
return $this->error; return $this->error;
if ( !current_user_can( 'edit_posts' ) ) if ( !current_user_can( 'edit_posts' ) )
return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this blog in order to view categories.' ) ); return new IXR_Error( 401, __( 'Sorry, you must be able to edit posts on this site in order to view categories.' ) );
do_action('xmlrpc_call', 'mt.getCategoryList'); do_action('xmlrpc_call', 'mt.getCategoryList');