diff --git a/wp-includes/ms-load.php b/wp-includes/ms-load.php index 8e8a263ac9..dca3590512 100644 --- a/wp-includes/ms-load.php +++ b/wp-includes/ms-load.php @@ -170,9 +170,9 @@ function wpmu_current_site() { // Still no dice. // @todo Update or remove WPMU codex link. if ( 1 == count( $sites ) ) - wp_die( sprintf( __( 'That blog does not exist. Please try %s.' ), $sites[0]->domain . $sites[0]->path ) ); + wp_die( sprintf( 'That blog does not exist. Please try %s.', $sites[0]->domain . $sites[0]->path ) ); else - wp_die( __( 'No site defined on this host. If you are the owner of this site, please check Debugging WPMU for further assistance.' ) ); + wp_die( 'No site defined on this host. If you are the owner of this site, please check Debugging WPMU for further assistance.' ); } /** @@ -186,27 +186,27 @@ function wpmu_current_site() { function ms_not_installed() { global $wpdb, $domain, $path; - $msg = '
' . __( 'If your site does not display, please contact the owner of this network.' ) . '
'; - $msg .= '' . __( 'If you are the owner of this network please check that MySQL is running properly and all tables are error free.' ) . '
'; + $msg = '' . 'If your site does not display, please contact the owner of this network.' . '
'; + $msg .= '' . 'If you are the owner of this network please check that MySQL is running properly and all tables are error free.' . '
'; if ( ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ) - $msg .= '' . sprintf( __( 'Database tables are missing. This means that MySQL is not running, WordPress was not installed properly, or someone deleted %s
. You really should look at your database now.' ), $wpdb->site ) . '
' . sprintf( 'Database tables are missing. This means that MySQL is not running, WordPress was not installed properly, or someone deleted %s
. You really should look at your database now.', $wpdb->site ) . '
' . sprintf( __( 'Could Not Find Site! Searched for table %1$s in %2$s
. Is that right?' ), $domain . $path, DB_NAME, $wpdb->blogs ) . '
' . sprintf( 'Could Not Find Site! Searched for table %1$s in %2$s
. Is that right?', $domain . $path, DB_NAME, $wpdb->blogs ) . '
' . __( 'Read the bug report page. Some of the guidelines there may help you figure out what went wrong.' ) . '
'; - $msg .= '' . __( "If you're still stuck with this message, then check that your database contains the following tables:" ) . '
' . 'Read the bug report page. Some of the guidelines there may help you figure out what went wrong.' . '
'; + $msg .= '' . "If you're still stuck with this message, then check that your database contains the following tables:" . '
' . __( 'If you suspect a problem please report it to the support forums but you must include the information asked for in the WPMU bug reporting guidelines! ' ) . '
'; + $msg = '' . 'If you suspect a problem please report it to the support forums but you must include the information asked for in the WPMU bug reporting guidelines! ' . '
'; // @todo This file no longer exists post-merge. if ( is_file( 'release-info.txt' ) ) { - $msg .= '' . __( 'Your bug report must include the following text:' ) . '
'; + $msg .= '' . 'Your bug report must include the following text:' . '
'; $info = file( 'release-info.txt' ); $msg .= $info[ 4 ] . '"'; } diff --git a/wp-includes/ms-settings.php b/wp-includes/ms-settings.php index 0c1bcc41ab..ceaa59deb8 100644 --- a/wp-includes/ms-settings.php +++ b/wp-includes/ms-settings.php @@ -110,7 +110,7 @@ if ( !isset( $current_site ) || !isset( $current_blog ) ) { $current_blog->blog_id = $blog_id = 1; } else { $msg = ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ? ' ' . __( 'Database tables are missing.' ) : ''; - wp_die( __( 'No blog by that name on this system.' ) . $msg ); + wp_die( 'No blog by that name on this system.' . $msg ); } } }