<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<title>[14313] trunk: s/blog/site/ in more places.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/14313">14313</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-04-30 01:54:32 +0000 (Fri, 30 Apr 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>s/blog/site/ in more places. props PeteMall, see <a href="http://trac.wordpress.org/ticket/11644">#11644</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadmineditlinkcategoryformphp">trunk/wp-admin/edit-link-category-form.php</a></li>
<li><a href="#trunkwpadminexportphp">trunk/wp-admin/export.php</a></li>
<li><a href="#trunkwpadminimportphp">trunk/wp-admin/import.php</a></li>
<li><a href="#trunkwpadminlinkaddphp">trunk/wp-admin/link-add.php</a></li>
<li><a href="#trunkwpadminlinkmanagerphp">trunk/wp-admin/link-manager.php</a></li>
<li><a href="#trunkwpadminlinkphp">trunk/wp-admin/link.php</a></li>
<li><a href="#trunkwpadminmseditphp">trunk/wp-admin/ms-edit.php</a></li>
<li><a href="#trunkwpadminplugininstallphp">trunk/wp-admin/plugin-install.php</a></li>
<li><a href="#trunkwpadminpluginsphp">trunk/wp-admin/plugins.php</a></li>
<li><a href="#trunkwpadminthemeeditorphp">trunk/wp-admin/theme-editor.php</a></li>
<li><a href="#trunkwpadminthemeinstallphp">trunk/wp-admin/theme-install.php</a></li>
<li><a href="#trunkwpadminupdatecorephp">trunk/wp-admin/update-core.php</a></li>
<li><a href="#trunkwpadminupdatephp">trunk/wp-admin/update.php</a></li>
<li><a href="#trunkwpincludesloadphp">trunk/wp-includes/load.php</a></li>
<li><a href="#trunkwpincludesmsloadphp">trunk/wp-includes/ms-load.php</a></li>
<li><a href="#trunkwpincludesmssettingsphp">trunk/wp-includes/ms-settings.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadmineditlinkcategoryformphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/edit-link-category-form.php (14312 => 14313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/edit-link-category-form.php 2010-04-29 21:41:20 UTC (rev 14312)
+++ trunk/wp-admin/edit-link-category-form.php 2010-04-30 01:54:32 UTC (rev 14313)
</span><span class="lines">@@ -11,7 +11,7 @@
</span><span class="cx"> die('-1');
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can('manage_categories') )
</span><del>- wp_die(__('You do not have sufficient permissions to edit link categories for this blog.'));
</del><ins>+ wp_die(__('You do not have sufficient permissions to edit link categories for this site.'));
</ins><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * @var object
</span></span></pre></div>
<a id="trunkwpadminexportphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/export.php (14312 => 14313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/export.php 2010-04-29 21:41:20 UTC (rev 14312)
+++ trunk/wp-admin/export.php 2010-04-30 01:54:32 UTC (rev 14313)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> require_once ('admin.php');
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can('edit_files') )
</span><del>- wp_die(__('You do not have sufficient permissions to export the content of this blog.'));
</del><ins>+ wp_die(__('You do not have sufficient permissions to export the content of this site.'));
</ins><span class="cx">
</span><span class="cx"> /** Load WordPress export API */
</span><span class="cx"> require_once('./includes/export.php');
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx">
</span><span class="cx"> <p><?php _e('When you click the button below WordPress will create an XML file for you to save to your computer.'); ?></p>
</span><span class="cx"> <p><?php _e('This format, which we call WordPress eXtended RSS or WXR, will contain your posts, pages, comments, custom fields, categories, and tags.'); ?></p>
</span><del>-<p><?php _e('Once you&#8217;ve saved the download file, you can use the Import function on another WordPress blog to import this blog.'); ?></p>
</del><ins>+<p><?php _e('Once you&#8217;ve saved the download file, you can use the Import function on another WordPress site to import this site.'); ?></p>
</ins><span class="cx"> <form action="" method="get">
</span><span class="cx"> <h3><?php _e('Options'); ?></h3>
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminimportphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/import.php (14312 => 14313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/import.php 2010-04-29 21:41:20 UTC (rev 14312)
+++ trunk/wp-admin/import.php 2010-04-30 01:54:32 UTC (rev 14313)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> require_once ('admin.php');
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can('edit_files') )
</span><del>- wp_die(__('You do not have sufficient permissions to import content in this blog.'));
</del><ins>+ wp_die(__('You do not have sufficient permissions to import content in this site.'));
</ins><span class="cx">
</span><span class="cx"> $title = __('Import');
</span><span class="cx"> require_once ('admin-header.php');
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> <div class="wrap">
</span><span class="cx"> <?php screen_icon(); ?>
</span><span class="cx"> <h2><?php echo esc_html( $title ); ?></h2>
</span><del>-<p><?php _e('If you have posts or comments in another system, WordPress can import those into this blog. To get started, choose a system to import from below:'); ?></p>
</del><ins>+<p><?php _e('If you have posts or comments in another system, WordPress can import those into this site. To get started, choose a system to import from below:'); ?></p>
</ins><span class="cx">
</span><span class="cx"> <?php
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminlinkaddphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/link-add.php (14312 => 14313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/link-add.php 2010-04-29 21:41:20 UTC (rev 14312)
+++ trunk/wp-admin/link-add.php 2010-04-30 01:54:32 UTC (rev 14313)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> require_once('./admin.php');
</span><span class="cx">
</span><span class="cx"> if ( ! current_user_can('manage_links') )
</span><del>- wp_die(__('You do not have sufficient permissions to add links to this blog.'));
</del><ins>+ wp_die(__('You do not have sufficient permissions to add links to this site.'));
</ins><span class="cx">
</span><span class="cx"> $title = __('Add New Link');
</span><span class="cx"> $parent_file = 'link-manager.php';
</span><span class="lines">@@ -27,4 +27,4 @@
</span><span class="cx"> include('./edit-link-form.php');
</span><span class="cx">
</span><span class="cx"> require('./admin-footer.php');
</span><del>-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+?>
</ins></span></pre></div>
<a id="trunkwpadminlinkmanagerphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/link-manager.php (14312 => 14313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/link-manager.php 2010-04-29 21:41:20 UTC (rev 14312)
+++ trunk/wp-admin/link-manager.php 2010-04-30 01:54:32 UTC (rev 14313)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> $doaction = $_GET['action'] ? $_GET['action'] : $_GET['action2'];
</span><span class="cx">
</span><span class="cx"> if ( ! current_user_can('manage_links') )
</span><del>- wp_die( __('You do not have sufficient permissions to edit the links for this blog.') );
</del><ins>+ wp_die( __('You do not have sufficient permissions to edit the links for this site.') );
</ins><span class="cx">
</span><span class="cx"> if ( 'delete' == $doaction ) {
</span><span class="cx"> $bulklinks = (array) $_GET['linkcheck'];
</span><span class="lines">@@ -46,7 +46,7 @@
</span><span class="cx"> include_once ('./admin-header.php');
</span><span class="cx">
</span><span class="cx"> if ( ! current_user_can('manage_links') )
</span><del>- wp_die(__("You do not have sufficient permissions to edit the links for this blog."));
</del><ins>+ wp_die(__("You do not have sufficient permissions to edit the links for this site."));
</ins><span class="cx">
</span><span class="cx"> switch ($order_by) {
</span><span class="cx"> case 'order_id' :
</span></span></pre></div>
<a id="trunkwpadminlinkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/link.php (14312 => 14313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/link.php 2010-04-29 21:41:20 UTC (rev 14312)
+++ trunk/wp-admin/link.php 2010-04-30 01:54:32 UTC (rev 14313)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> wp_reset_vars(array('action', 'cat_id', 'linkurl', 'name', 'image', 'description', 'visible', 'target', 'category', 'link_id', 'submit', 'order_by', 'links_show_cat_id', 'rating', 'rel', 'notes', 'linkcheck[]'));
</span><span class="cx">
</span><span class="cx"> if ( ! current_user_can('manage_links') )
</span><del>- wp_die( __('You do not have sufficient permissions to edit the links for this blog.') );
</del><ins>+ wp_die( __('You do not have sufficient permissions to edit the links for this site.') );
</ins><span class="cx">
</span><span class="cx"> if ( !empty($_POST['deletebookmarks']) )
</span><span class="cx"> $action = 'deletebookmarks';
</span></span></pre></div>
<a id="trunkwpadminmseditphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/ms-edit.php (14312 => 14313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/ms-edit.php 2010-04-29 21:41:20 UTC (rev 14312)
+++ trunk/wp-admin/ms-edit.php 2010-04-30 01:54:32 UTC (rev 14313)
</span><span class="lines">@@ -82,7 +82,7 @@
</span><span class="cx"> $blog_details = get_blog_details( $dashboard_blog );
</span><span class="cx"> if ( false === $blog_details ) {
</span><span class="cx"> if ( is_numeric( $dashboard_blog ) )
</span><del>- wp_die( __( 'Dashboard blog_id must be a blog that already exists' ) );
</del><ins>+ wp_die( __( 'A dashboard site referenced by ID must already exist' ) );
</ins><span class="cx"> if ( is_subdomain_install() ) {
</span><span class="cx"> $domain = $dashboard_blog . '.' . $current_site->domain;
</span><span class="cx"> $path = $current_site->path;
</span><span class="lines">@@ -98,7 +98,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> if ( is_wp_error( $dashboard_blog_id ) )
</span><del>- wp_die( __( 'Problem creating dashboard blog: ' ) . $dashboard_blog_id->get_error_message() );
</del><ins>+ wp_die( __( 'Problem creating dashboard site: ' ) . $dashboard_blog_id->get_error_message() );
</ins><span class="cx"> if ( $_POST['dashboard_blog_orig'] != $_POST['dashboard_blog'] ) {
</span><span class="cx"> $users = get_users_of_blog( get_site_option( 'dashboard_blog' ) );
</span><span class="cx"> $move_users = array();
</span></span></pre></div>
<a id="trunkwpadminplugininstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugin-install.php (14312 => 14313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugin-install.php 2010-04-29 21:41:20 UTC (rev 14312)
+++ trunk/wp-admin/plugin-install.php 2010-04-30 01:54:32 UTC (rev 14313)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> require_once('./admin.php');
</span><span class="cx">
</span><span class="cx"> if ( ! current_user_can('install_plugins') )
</span><del>- wp_die(__('You do not have sufficient permissions to install plugins on this blog.'));
</del><ins>+ wp_die(__('You do not have sufficient permissions to install plugins on this site.'));
</ins><span class="cx">
</span><span class="cx"> include(ABSPATH . 'wp-admin/includes/plugin-install.php');
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (14312 => 14313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2010-04-29 21:41:20 UTC (rev 14312)
+++ trunk/wp-admin/plugins.php 2010-04-30 01:54:32 UTC (rev 14313)
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> switch ( $action ) {
</span><span class="cx"> case 'activate':
</span><span class="cx"> if ( ! current_user_can('activate_plugins') )
</span><del>- wp_die(__('You do not have sufficient permissions to activate plugins for this blog.'));
</del><ins>+ wp_die(__('You do not have sufficient permissions to activate plugins for this site.'));
</ins><span class="cx">
</span><span class="cx"> check_admin_referer('activate-plugin_' . $plugin);
</span><span class="cx">
</span><span class="lines">@@ -72,7 +72,7 @@
</span><span class="cx"> case 'activate-selected':
</span><span class="cx"> case 'network-activate-selected':
</span><span class="cx"> if ( ! current_user_can('activate_plugins') )
</span><del>- wp_die(__('You do not have sufficient permissions to activate plugins for this blog.'));
</del><ins>+ wp_die(__('You do not have sufficient permissions to activate plugins for this site.'));
</ins><span class="cx">
</span><span class="cx"> check_admin_referer('bulk-manage-plugins');
</span><span class="cx">
</span><span class="lines">@@ -126,7 +126,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case 'error_scrape':
</span><span class="cx"> if ( ! current_user_can('activate_plugins') )
</span><del>- wp_die(__('You do not have sufficient permissions to activate plugins for this blog.'));
</del><ins>+ wp_die(__('You do not have sufficient permissions to activate plugins for this site.'));
</ins><span class="cx">
</span><span class="cx"> check_admin_referer('plugin-activation-error_' . $plugin);
</span><span class="cx">
</span><span class="lines">@@ -152,7 +152,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case 'deactivate':
</span><span class="cx"> if ( ! current_user_can('activate_plugins') )
</span><del>- wp_die(__('You do not have sufficient permissions to deactivate plugins for this blog.'));
</del><ins>+ wp_die(__('You do not have sufficient permissions to deactivate plugins for this site.'));
</ins><span class="cx">
</span><span class="cx"> check_admin_referer('deactivate-plugin_' . $plugin);
</span><span class="cx"> deactivate_plugins($plugin);
</span><span class="lines">@@ -165,7 +165,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case 'deactivate-selected':
</span><span class="cx"> if ( ! current_user_can('activate_plugins') )
</span><del>- wp_die(__('You do not have sufficient permissions to deactivate plugins for this blog.'));
</del><ins>+ wp_die(__('You do not have sufficient permissions to deactivate plugins for this site.'));
</ins><span class="cx">
</span><span class="cx"> check_admin_referer('bulk-manage-plugins');
</span><span class="cx">
</span><span class="lines">@@ -188,7 +188,7 @@
</span><span class="cx"> break;
</span><span class="cx"> case 'delete-selected':
</span><span class="cx"> if ( ! current_user_can('delete_plugins') )
</span><del>- wp_die(__('You do not have sufficient permissions to delete plugins for this blog.'));
</del><ins>+ wp_die(__('You do not have sufficient permissions to delete plugins for this site.'));
</ins><span class="cx">
</span><span class="cx"> check_admin_referer('bulk-manage-plugins');
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminthemeeditorphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/theme-editor.php (14312 => 14313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/theme-editor.php 2010-04-29 21:41:20 UTC (rev 14312)
+++ trunk/wp-admin/theme-editor.php 2010-04-30 01:54:32 UTC (rev 14313)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> require_once('./admin.php');
</span><span class="cx">
</span><span class="cx"> if ( !current_user_can('edit_themes') )
</span><del>- wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this blog.').'</p>');
</del><ins>+ wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this site.').'</p>');
</ins><span class="cx">
</span><span class="cx"> $title = __("Edit Themes");
</span><span class="cx"> $parent_file = 'themes.php';
</span></span></pre></div>
<a id="trunkwpadminthemeinstallphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/theme-install.php (14312 => 14313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/theme-install.php 2010-04-29 21:41:20 UTC (rev 14312)
+++ trunk/wp-admin/theme-install.php 2010-04-30 01:54:32 UTC (rev 14313)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> require_once('./admin.php');
</span><span class="cx">
</span><span class="cx"> if ( ! current_user_can('install_themes') )
</span><del>- wp_die(__('You do not have sufficient permissions to install themes on this blog.'));
</del><ins>+ wp_die(__('You do not have sufficient permissions to install themes on this site.'));
</ins><span class="cx">
</span><span class="cx"> include(ABSPATH . 'wp-admin/includes/theme-install.php');
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpadminupdatecorephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update-core.php (14312 => 14313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update-core.php 2010-04-29 21:41:20 UTC (rev 14312)
+++ trunk/wp-admin/update-core.php 2010-04-30 01:54:32 UTC (rev 14313)
</span><span class="lines">@@ -10,7 +10,7 @@
</span><span class="cx"> require_once('./admin.php');
</span><span class="cx">
</span><span class="cx"> if ( ! current_user_can('update_plugins') )
</span><del>- wp_die(__('You do not have sufficient permissions to update plugins for this blog.'));
</del><ins>+ wp_die(__('You do not have sufficient permissions to update plugins for this site.'));
</ins><span class="cx">
</span><span class="cx"> function list_core_update( $update ) {
</span><span class="cx"> global $wp_local_package, $wpdb;
</span></span></pre></div>
<a id="trunkwpadminupdatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/update.php (14312 => 14313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/update.php 2010-04-29 21:41:20 UTC (rev 14312)
+++ trunk/wp-admin/update.php 2010-04-30 01:54:32 UTC (rev 14313)
</span><span class="lines">@@ -18,7 +18,7 @@
</span><span class="cx">
</span><span class="cx"> if ( 'update-selected' == $action ) {
</span><span class="cx"> if ( ! current_user_can( 'update_plugins' ) )
</span><del>- wp_die( __( 'You do not have sufficient permissions to update plugins for this blog.' ) );
</del><ins>+ wp_die( __( 'You do not have sufficient permissions to update plugins for this site.' ) );
</ins><span class="cx">
</span><span class="cx"> check_admin_referer( 'bulk-update-plugins' );
</span><span class="cx">
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx">
</span><span class="cx"> } elseif ( 'upgrade-plugin' == $action ) {
</span><span class="cx"> if ( ! current_user_can('update_plugins') )
</span><del>- wp_die(__('You do not have sufficient permissions to update plugins for this blog.'));
</del><ins>+ wp_die(__('You do not have sufficient permissions to update plugins for this site.'));
</ins><span class="cx">
</span><span class="cx"> check_admin_referer('upgrade-plugin_' . $plugin);
</span><span class="cx">
</span><span class="lines">@@ -64,7 +64,7 @@
</span><span class="cx">
</span><span class="cx"> } elseif ('activate-plugin' == $action ) {
</span><span class="cx"> if ( ! current_user_can('update_plugins') )
</span><del>- wp_die(__('You do not have sufficient permissions to update plugins for this blog.'));
</del><ins>+ wp_die(__('You do not have sufficient permissions to update plugins for this site.'));
</ins><span class="cx">
</span><span class="cx"> check_admin_referer('activate-plugin_' . $plugin);
</span><span class="cx"> if ( ! isset($_GET['failure']) && ! isset($_GET['success']) ) {
</span><span class="lines">@@ -92,7 +92,7 @@
</span><span class="cx"> } elseif ( 'install-plugin' == $action ) {
</span><span class="cx">
</span><span class="cx"> if ( ! current_user_can('install_plugins') )
</span><del>- wp_die(__('You do not have sufficient permissions to install plugins for this blog.'));
</del><ins>+ wp_die(__('You do not have sufficient permissions to install plugins for this site.'));
</ins><span class="cx">
</span><span class="cx"> include_once ABSPATH . 'wp-admin/includes/plugin-install.php'; //for plugins_api..
</span><span class="cx">
</span><span class="lines">@@ -120,7 +120,7 @@
</span><span class="cx"> } elseif ( 'upload-plugin' == $action ) {
</span><span class="cx">
</span><span class="cx"> if ( ! current_user_can('install_plugins') )
</span><del>- wp_die(__('You do not have sufficient permissions to install plugins for this blog.'));
</del><ins>+ wp_die(__('You do not have sufficient permissions to install plugins for this site.'));
</ins><span class="cx">
</span><span class="cx"> check_admin_referer('plugin-upload');
</span><span class="cx">
</span><span class="lines">@@ -144,7 +144,7 @@
</span><span class="cx"> } elseif ( 'upgrade-theme' == $action ) {
</span><span class="cx">
</span><span class="cx"> if ( ! current_user_can('update_themes') )
</span><del>- wp_die(__('You do not have sufficient permissions to update themes for this blog.'));
</del><ins>+ wp_die(__('You do not have sufficient permissions to update themes for this site.'));
</ins><span class="cx">
</span><span class="cx"> check_admin_referer('upgrade-theme_' . $theme);
</span><span class="cx">
</span><span class="lines">@@ -164,7 +164,7 @@
</span><span class="cx"> include('./admin-footer.php');
</span><span class="cx"> } elseif ( 'update-selected-themes' == $action ) {
</span><span class="cx"> if ( ! current_user_can( 'update_themes' ) )
</span><del>- wp_die( __( 'You do not have sufficient permissions to update themes for this blog.' ) );
</del><ins>+ wp_die( __( 'You do not have sufficient permissions to update themes for this site.' ) );
</ins><span class="cx">
</span><span class="cx"> check_admin_referer( 'bulk-update-themes' );
</span><span class="cx">
</span><span class="lines">@@ -191,7 +191,7 @@
</span><span class="cx"> } elseif ( 'install-theme' == $action ) {
</span><span class="cx">
</span><span class="cx"> if ( ! current_user_can('install_themes') )
</span><del>- wp_die(__('You do not have sufficient permissions to install themes for this blog.'));
</del><ins>+ wp_die(__('You do not have sufficient permissions to install themes for this site.'));
</ins><span class="cx">
</span><span class="cx"> include_once ABSPATH . 'wp-admin/includes/theme-install.php'; //for themes_api..
</span><span class="cx">
</span><span class="lines">@@ -221,7 +221,7 @@
</span><span class="cx"> } elseif ( 'upload-theme' == $action ) {
</span><span class="cx">
</span><span class="cx"> if ( ! current_user_can('install_themes') )
</span><del>- wp_die(__('You do not have sufficient permissions to install themes for this blog.'));
</del><ins>+ wp_die(__('You do not have sufficient permissions to install themes for this site.'));
</ins><span class="cx">
</span><span class="cx"> check_admin_referer('theme-upload');
</span><span class="cx">
</span><span class="lines">@@ -247,4 +247,4 @@
</span><span class="cx"> } else {
</span><span class="cx"> do_action('update-custom_' . $action);
</span><span class="cx"> }
</span><del>-}
</del><span class="cx">\ No newline at end of file
</span><ins>+}
</ins></span></pre></div>
<a id="trunkwpincludesloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/load.php (14312 => 14313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/load.php 2010-04-29 21:41:20 UTC (rev 14312)
+++ trunk/wp-includes/load.php 2010-04-30 01:54:32 UTC (rev 14313)
</span><span class="lines">@@ -392,7 +392,7 @@
</span><span class="cx"> function wp_not_installed() {
</span><span class="cx"> if ( is_multisite() ) {
</span><span class="cx"> if ( ! is_blog_installed() && ! defined( 'WP_INSTALLING' ) )
</span><del>- wp_die( __( 'The blog you have requested is not installed properly. Please contact the system administrator.' ) );
</del><ins>+ wp_die( __( 'The site you have requested is not installed properly. Please contact the system administrator.' ) );
</ins><span class="cx"> } elseif ( ! is_blog_installed() && false === strpos( $_SERVER['PHP_SELF'], 'install.php' ) && !defined( 'WP_INSTALLING' ) ) {
</span><span class="cx"> if ( defined( 'WP_SITEURL' ) )
</span><span class="cx"> $link = WP_SITEURL . '/wp-admin/install.php';
</span><span class="lines">@@ -583,4 +583,4 @@
</span><span class="cx"> return false;
</span><span class="cx"> }
</span><span class="cx">
</span><del>-?>
</del><span class="cx">\ No newline at end of file
</span><ins>+?>
</ins></span></pre></div>
<a id="trunkwpincludesmsloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-load.php (14312 => 14313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-load.php 2010-04-29 21:41:20 UTC (rev 14312)
+++ trunk/wp-includes/ms-load.php 2010-04-30 01:54:32 UTC (rev 14313)
</span><span class="lines">@@ -68,7 +68,7 @@
</span><span class="cx"> return WP_CONTENT_DIR . '/blog-suspended.php';
</span><span class="cx"> } else {
</span><span class="cx"> header( 'HTTP/1.1 410 Gone' );
</span><del>- wp_die( /*WP_I18N_ARCHIVED*/'This blog has been archived or suspended.'/*/WP_I18N_ARCHIVED*/ );
</del><ins>+ wp_die( /*WP_I18N_ARCHIVED*/'This site has been archived or suspended.'/*/WP_I18N_ARCHIVED*/ );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -181,7 +181,7 @@
</span><span class="cx"> // Still no dice.
</span><span class="cx"> // @todo Update or remove WPMU codex link.
</span><span class="cx"> if ( 1 == count( $sites ) )
</span><del>- wp_die( sprintf( /*WP_I18N_BLOG_DOESNT_EXIST*/'That blog does not exist. Please try <a href="%s">%s</a>.'/*/WP_I18N_BLOG_DOESNT_EXIST*/, $sites[0]->domain . $sites[0]->path ) );
</del><ins>+ wp_die( sprintf( /*WP_I18N_BLOG_DOESNT_EXIST*/'That site does not exist. Please try <a href="%s">%s</a>.'/*/WP_I18N_BLOG_DOESNT_EXIST*/, $sites[0]->domain . $sites[0]->path ) );
</ins><span class="cx"> else
</span><span class="cx"> wp_die( /*WP_I18N_NO_SITE_DEFINED*/'No site defined on this host. If you are the owner of this site, please check <a href="http://codex.wordpress.org/Debugging_WPMU">Debugging WPMU</a> for help.'/*/WP_I18N_NO_SITE_DEFINED*/ );
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesmssettingsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/ms-settings.php (14312 => 14313)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/ms-settings.php 2010-04-29 21:41:20 UTC (rev 14312)
+++ trunk/wp-includes/ms-settings.php 2010-04-30 01:54:32 UTC (rev 14313)
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx"> $current_blog->blog_id = $blog_id = 1;
</span><span class="cx"> } else {
</span><span class="cx"> $msg = ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ? ' ' . /*WP_I18N_TABLES_MISSING*/'Database tables are missing.'/*/WP_I18N_TABLES_MISSING*/ : '';
</span><del>- wp_die( /*WP_I18N_NO_BLOG*/'No blog by that name on this system.'/*/WP_I18N_NO_BLOG*/ . $msg );
</del><ins>+ wp_die( /*WP_I18N_NO_BLOG*/'No site by that name on this system.'/*/WP_I18N_NO_BLOG*/ . $msg );
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>