Ticket #11644: 11644.blog-site.diff
| File 11644.blog-site.diff, 16.4 KB (added by , 15 years ago) |
|---|
-
wp-includes/load.php
392 392 function wp_not_installed() { 393 393 if ( is_multisite() ) { 394 394 if ( ! is_blog_installed() && ! defined( 'WP_INSTALLING' ) ) 395 wp_die( __( 'The blogyou have requested is not installed properly. Please contact the system administrator.' ) );395 wp_die( __( 'The site you have requested is not installed properly. Please contact the system administrator.' ) ); 396 396 } elseif ( ! is_blog_installed() && false === strpos( $_SERVER['PHP_SELF'], 'install.php' ) && !defined( 'WP_INSTALLING' ) ) { 397 397 if ( defined( 'WP_SITEURL' ) ) 398 398 $link = WP_SITEURL . '/wp-admin/install.php'; … … 583 583 return false; 584 584 } 585 585 586 ?> 587 No newline at end of file 586 ?> -
wp-includes/ms-load.php
68 68 return WP_CONTENT_DIR . '/blog-suspended.php'; 69 69 } else { 70 70 header( 'HTTP/1.1 410 Gone' ); 71 wp_die( /*WP_I18N_ARCHIVED*/'This bloghas been archived or suspended.'/*/WP_I18N_ARCHIVED*/ );71 wp_die( /*WP_I18N_ARCHIVED*/'This site has been archived or suspended.'/*/WP_I18N_ARCHIVED*/ ); 72 72 } 73 73 } 74 74 … … 181 181 // Still no dice. 182 182 // @todo Update or remove WPMU codex link. 183 183 if ( 1 == count( $sites ) ) 184 wp_die( sprintf( /*WP_I18N_BLOG_DOESNT_EXIST*/'That blogdoes not exist. Please try <a href="%s">%s</a>.'/*/WP_I18N_BLOG_DOESNT_EXIST*/, $sites[0]->domain . $sites[0]->path ) );184 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 ) ); 185 185 else 186 186 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*/ ); 187 187 } -
wp-includes/ms-settings.php
115 115 $current_blog->blog_id = $blog_id = 1; 116 116 } else { 117 117 $msg = ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ? ' ' . /*WP_I18N_TABLES_MISSING*/'Database tables are missing.'/*/WP_I18N_TABLES_MISSING*/ : ''; 118 wp_die( /*WP_I18N_NO_BLOG*/'No blogby that name on this system.'/*/WP_I18N_NO_BLOG*/ . $msg );118 wp_die( /*WP_I18N_NO_BLOG*/'No site by that name on this system.'/*/WP_I18N_NO_BLOG*/ . $msg ); 119 119 } 120 120 } 121 121 } -
wp-admin/ms-edit.php
82 82 $blog_details = get_blog_details( $dashboard_blog ); 83 83 if ( false === $blog_details ) { 84 84 if ( is_numeric( $dashboard_blog ) ) 85 wp_die( __( ' Dashboard blog_id must be a blog that already exists' ) );85 wp_die( __( 'A dashboard site referenced by ID must already exist' ) ); 86 86 if ( is_subdomain_install() ) { 87 87 $domain = $dashboard_blog . '.' . $current_site->domain; 88 88 $path = $current_site->path; … … 98 98 } 99 99 } 100 100 if ( is_wp_error( $dashboard_blog_id ) ) 101 wp_die( __( 'Problem creating dashboard blog: ' ) . $dashboard_blog_id->get_error_message() );101 wp_die( __( 'Problem creating dashboard site: ' ) . $dashboard_blog_id->get_error_message() ); 102 102 if ( $_POST['dashboard_blog_orig'] != $_POST['dashboard_blog'] ) { 103 103 $users = get_users_of_blog( get_site_option( 'dashboard_blog' ) ); 104 104 $move_users = array(); -
wp-admin/update.php
18 18 19 19 if ( 'update-selected' == $action ) { 20 20 if ( ! current_user_can( 'update_plugins' ) ) 21 wp_die( __( 'You do not have sufficient permissions to update plugins for this blog.' ) );21 wp_die( __( 'You do not have sufficient permissions to update plugins for this site.' ) ); 22 22 23 23 check_admin_referer( 'bulk-update-plugins' ); 24 24 … … 45 45 46 46 } elseif ( 'upgrade-plugin' == $action ) { 47 47 if ( ! current_user_can('update_plugins') ) 48 wp_die(__('You do not have sufficient permissions to update plugins for this blog.'));48 wp_die(__('You do not have sufficient permissions to update plugins for this site.')); 49 49 50 50 check_admin_referer('upgrade-plugin_' . $plugin); 51 51 … … 64 64 65 65 } elseif ('activate-plugin' == $action ) { 66 66 if ( ! current_user_can('update_plugins') ) 67 wp_die(__('You do not have sufficient permissions to update plugins for this blog.'));67 wp_die(__('You do not have sufficient permissions to update plugins for this site.')); 68 68 69 69 check_admin_referer('activate-plugin_' . $plugin); 70 70 if ( ! isset($_GET['failure']) && ! isset($_GET['success']) ) { … … 92 92 } elseif ( 'install-plugin' == $action ) { 93 93 94 94 if ( ! current_user_can('install_plugins') ) 95 wp_die(__('You do not have sufficient permissions to install plugins for this blog.'));95 wp_die(__('You do not have sufficient permissions to install plugins for this site.')); 96 96 97 97 include_once ABSPATH . 'wp-admin/includes/plugin-install.php'; //for plugins_api.. 98 98 … … 120 120 } elseif ( 'upload-plugin' == $action ) { 121 121 122 122 if ( ! current_user_can('install_plugins') ) 123 wp_die(__('You do not have sufficient permissions to install plugins for this blog.'));123 wp_die(__('You do not have sufficient permissions to install plugins for this site.')); 124 124 125 125 check_admin_referer('plugin-upload'); 126 126 … … 144 144 } elseif ( 'upgrade-theme' == $action ) { 145 145 146 146 if ( ! current_user_can('update_themes') ) 147 wp_die(__('You do not have sufficient permissions to update themes for this blog.'));147 wp_die(__('You do not have sufficient permissions to update themes for this site.')); 148 148 149 149 check_admin_referer('upgrade-theme_' . $theme); 150 150 … … 164 164 include('./admin-footer.php'); 165 165 } elseif ( 'update-selected-themes' == $action ) { 166 166 if ( ! current_user_can( 'update_themes' ) ) 167 wp_die( __( 'You do not have sufficient permissions to update themes for this blog.' ) );167 wp_die( __( 'You do not have sufficient permissions to update themes for this site.' ) ); 168 168 169 169 check_admin_referer( 'bulk-update-themes' ); 170 170 … … 191 191 } elseif ( 'install-theme' == $action ) { 192 192 193 193 if ( ! current_user_can('install_themes') ) 194 wp_die(__('You do not have sufficient permissions to install themes for this blog.'));194 wp_die(__('You do not have sufficient permissions to install themes for this site.')); 195 195 196 196 include_once ABSPATH . 'wp-admin/includes/theme-install.php'; //for themes_api.. 197 197 … … 221 221 } elseif ( 'upload-theme' == $action ) { 222 222 223 223 if ( ! current_user_can('install_themes') ) 224 wp_die(__('You do not have sufficient permissions to install themes for this blog.'));224 wp_die(__('You do not have sufficient permissions to install themes for this site.')); 225 225 226 226 check_admin_referer('theme-upload'); 227 227 … … 247 247 } else { 248 248 do_action('update-custom_' . $action); 249 249 } 250 } 251 No newline at end of file 250 } -
wp-admin/theme-editor.php
10 10 require_once('./admin.php'); 11 11 12 12 if ( !current_user_can('edit_themes') ) 13 wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this blog.').'</p>');13 wp_die('<p>'.__('You do not have sufficient permissions to edit templates for this site.').'</p>'); 14 14 15 15 $title = __("Edit Themes"); 16 16 $parent_file = 'themes.php'; -
wp-admin/edit-link-category-form.php
11 11 die('-1'); 12 12 13 13 if ( !current_user_can('manage_categories') ) 14 wp_die(__('You do not have sufficient permissions to edit link categories for this blog.'));14 wp_die(__('You do not have sufficient permissions to edit link categories for this site.')); 15 15 16 16 /** 17 17 * @var object -
wp-admin/plugin-install.php
10 10 require_once('./admin.php'); 11 11 12 12 if ( ! current_user_can('install_plugins') ) 13 wp_die(__('You do not have sufficient permissions to install plugins on this blog.'));13 wp_die(__('You do not have sufficient permissions to install plugins on this site.')); 14 14 15 15 include(ABSPATH . 'wp-admin/includes/plugin-install.php'); 16 16 -
wp-admin/plugins.php
45 45 switch ( $action ) { 46 46 case 'activate': 47 47 if ( ! current_user_can('activate_plugins') ) 48 wp_die(__('You do not have sufficient permissions to activate plugins for this blog.'));48 wp_die(__('You do not have sufficient permissions to activate plugins for this site.')); 49 49 50 50 check_admin_referer('activate-plugin_' . $plugin); 51 51 … … 72 72 case 'activate-selected': 73 73 case 'network-activate-selected': 74 74 if ( ! current_user_can('activate_plugins') ) 75 wp_die(__('You do not have sufficient permissions to activate plugins for this blog.'));75 wp_die(__('You do not have sufficient permissions to activate plugins for this site.')); 76 76 77 77 check_admin_referer('bulk-manage-plugins'); 78 78 … … 126 126 break; 127 127 case 'error_scrape': 128 128 if ( ! current_user_can('activate_plugins') ) 129 wp_die(__('You do not have sufficient permissions to activate plugins for this blog.'));129 wp_die(__('You do not have sufficient permissions to activate plugins for this site.')); 130 130 131 131 check_admin_referer('plugin-activation-error_' . $plugin); 132 132 … … 152 152 break; 153 153 case 'deactivate': 154 154 if ( ! current_user_can('activate_plugins') ) 155 wp_die(__('You do not have sufficient permissions to deactivate plugins for this blog.'));155 wp_die(__('You do not have sufficient permissions to deactivate plugins for this site.')); 156 156 157 157 check_admin_referer('deactivate-plugin_' . $plugin); 158 158 deactivate_plugins($plugin); … … 165 165 break; 166 166 case 'deactivate-selected': 167 167 if ( ! current_user_can('activate_plugins') ) 168 wp_die(__('You do not have sufficient permissions to deactivate plugins for this blog.'));168 wp_die(__('You do not have sufficient permissions to deactivate plugins for this site.')); 169 169 170 170 check_admin_referer('bulk-manage-plugins'); 171 171 … … 188 188 break; 189 189 case 'delete-selected': 190 190 if ( ! current_user_can('delete_plugins') ) 191 wp_die(__('You do not have sufficient permissions to delete plugins for this blog.'));191 wp_die(__('You do not have sufficient permissions to delete plugins for this site.')); 192 192 193 193 check_admin_referer('bulk-manage-plugins'); 194 194 -
wp-admin/link-add.php
10 10 require_once('./admin.php'); 11 11 12 12 if ( ! current_user_can('manage_links') ) 13 wp_die(__('You do not have sufficient permissions to add links to this blog.'));13 wp_die(__('You do not have sufficient permissions to add links to this site.')); 14 14 15 15 $title = __('Add New Link'); 16 16 $parent_file = 'link-manager.php'; … … 27 27 include('./edit-link-form.php'); 28 28 29 29 require('./admin-footer.php'); 30 ?> 31 No newline at end of file 30 ?> -
wp-admin/link.php
15 15 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[]')); 16 16 17 17 if ( ! current_user_can('manage_links') ) 18 wp_die( __('You do not have sufficient permissions to edit the links for this blog.') );18 wp_die( __('You do not have sufficient permissions to edit the links for this site.') ); 19 19 20 20 if ( !empty($_POST['deletebookmarks']) ) 21 21 $action = 'deletebookmarks'; -
wp-admin/link-manager.php
15 15 $doaction = $_GET['action'] ? $_GET['action'] : $_GET['action2']; 16 16 17 17 if ( ! current_user_can('manage_links') ) 18 wp_die( __('You do not have sufficient permissions to edit the links for this blog.') );18 wp_die( __('You do not have sufficient permissions to edit the links for this site.') ); 19 19 20 20 if ( 'delete' == $doaction ) { 21 21 $bulklinks = (array) $_GET['linkcheck']; … … 46 46 include_once ('./admin-header.php'); 47 47 48 48 if ( ! current_user_can('manage_links') ) 49 wp_die(__("You do not have sufficient permissions to edit the links for this blog."));49 wp_die(__("You do not have sufficient permissions to edit the links for this site.")); 50 50 51 51 switch ($order_by) { 52 52 case 'order_id' : -
wp-admin/theme-install.php
10 10 require_once('./admin.php'); 11 11 12 12 if ( ! current_user_can('install_themes') ) 13 wp_die(__('You do not have sufficient permissions to install themes on this blog.'));13 wp_die(__('You do not have sufficient permissions to install themes on this site.')); 14 14 15 15 include(ABSPATH . 'wp-admin/includes/theme-install.php'); 16 16 -
wp-admin/update-core.php
10 10 require_once('./admin.php'); 11 11 12 12 if ( ! current_user_can('update_plugins') ) 13 wp_die(__('You do not have sufficient permissions to update plugins for this blog.'));13 wp_die(__('You do not have sufficient permissions to update plugins for this site.')); 14 14 15 15 function list_core_update( $update ) { 16 16 global $wp_local_package, $wpdb; -
wp-admin/import.php
10 10 require_once ('admin.php'); 11 11 12 12 if ( !current_user_can('edit_files') ) 13 wp_die(__('You do not have sufficient permissions to import content in this blog.'));13 wp_die(__('You do not have sufficient permissions to import content in this site.')); 14 14 15 15 $title = __('Import'); 16 16 require_once ('admin-header.php'); … … 20 20 <div class="wrap"> 21 21 <?php screen_icon(); ?> 22 22 <h2><?php echo esc_html( $title ); ?></h2> 23 <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>23 <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> 24 24 25 25 <?php 26 26 -
wp-admin/export.php
10 10 require_once ('admin.php'); 11 11 12 12 if ( !current_user_can('edit_files') ) 13 wp_die(__('You do not have sufficient permissions to export the content of this blog.'));13 wp_die(__('You do not have sufficient permissions to export the content of this site.')); 14 14 15 15 /** Load WordPress export API */ 16 16 require_once('./includes/export.php'); … … 59 59 60 60 <p><?php _e('When you click the button below WordPress will create an XML file for you to save to your computer.'); ?></p> 61 61 <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> 62 <p><?php _e('Once you’ve saved the download file, you can use the Import function on another WordPress blog to import this blog.'); ?></p>62 <p><?php _e('Once you’ve saved the download file, you can use the Import function on another WordPress site to import this site.'); ?></p> 63 63 <form action="" method="get"> 64 64 <h3><?php _e('Options'); ?></h3> 65 65