WordPress.org

Make WordPress Core

Changeset 13575


Ignore:
Timestamp:
03/03/2010 05:13:38 PM (10 years ago)
Author:
wpmuguru
Message:

remove ( calls from ms startup, see #11644

Location:
trunk/wp-includes
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/wp-includes/ms-load.php

    r13392 r13575  
    171171    // @todo Update or remove WPMU codex link.
    172172    if ( 1 == count( $sites ) )
    173         wp_die( sprintf( __( 'That blog does not exist. Please try <a href="%s">%s</a>.' ), $sites[0]->domain . $sites[0]->path ) );
     173        wp_die( sprintf( 'That blog does not exist. Please try <a href="%s">%s</a>.', $sites[0]->domain . $sites[0]->path ) );
    174174    else
    175         wp_die( __( '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 further assistance.' ) );
     175        wp_die( '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 further assistance.' );
    176176}
    177177
     
    187187    global $wpdb, $domain, $path;
    188188
    189     $msg = '<h1>' . esc_html__( 'Fatal Error' ) . '</h1>';
    190     $msg  = '<p>' . __( 'If your site does not display, please contact the owner of this network.' ) . '</p>';
    191     $msg .= '<p>' . __( 'If you are the owner of this network please check that MySQL is running properly and all tables are error free.' ) . '</p>';
     189    $msg = '<h1>' . esc_html( 'Fatal Error' ) . '</h1>';
     190    $msg  = '<p>' . 'If your site does not display, please contact the owner of this network.' . '</p>';
     191    $msg .= '<p>' . 'If you are the owner of this network please check that MySQL is running properly and all tables are error free.' . '</p>';
    192192    if ( ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) )
    193         $msg .= '<p>' . sprintf( __( '<strong>Database tables are missing.</strong> This means that MySQL is not running, WordPress was not installed properly, or someone deleted <code>%s</code>. You really <em>should</em> look at your database now.' ), $wpdb->site ) . '</p>';
     193        $msg .= '<p>' . sprintf( '<strong>Database tables are missing.</strong> This means that MySQL is not running, WordPress was not installed properly, or someone deleted <code>%s</code>. You really <em>should</em> look at your database now.', $wpdb->site ) . '</p>';
    194194    else
    195         $msg .= '<p>' . sprintf( __( '<strong>Could Not Find Site!</strong> Searched for table <em>%1$s</em> in <code>%2$s</code>. Is that right?' ), $domain . $path, DB_NAME, $wpdb->blogs ) . '</p>';
    196     $msg .= '<h1>' . esc_html__( 'What do I do now?' ) . '</h1>';
     195        $msg .= '<p>' . sprintf( '<strong>Could Not Find Site!</strong> Searched for table <em>%1$s</em> in <code>%2$s</code>. Is that right?', $domain . $path, DB_NAME, $wpdb->blogs ) . '</p>';
     196    $msg .= '<h1>' . esc_html( 'What do I do now?' ) . '</h1>';
    197197    // @todo Update WPMU codex link.
    198     $msg .= '<p>' . __( 'Read the <a target="_blank" href="http://codex.wordpress.org/Debugging_WPMU">bug report</a> page. Some of the guidelines there may help you figure out what went wrong.' ) . '</p>';
    199     $msg .= '<p>' . __( "If you're still stuck with this message, then check that your database contains the following tables:" ) . '</p><ul>';
     198    $msg .= '<p>' . 'Read the <a target="_blank" href="http://codex.wordpress.org/Debugging_WPMU">bug report</a> page. Some of the guidelines there may help you figure out what went wrong.' . '</p>';
     199    $msg .= '<p>' . "If you're still stuck with this message, then check that your database contains the following tables:" . '</p><ul>';
    200200    foreach ( $wpdb->global_tables as $table ) {
    201201        $msg .= '<li>' . $wpdb->prefix . $table . '</li>';
     
    203203    $msg .= '</ul>';
    204204    // @todo Update WPMU codex link and support instructions.
    205     $msg = '<p>' . __( 'If you suspect a problem please report it to the support forums but you must include the information asked for in the <a target="_blank" href="http://codex.wordpress.org/Debugging_WPMU">WPMU bug reporting guidelines</a>! ' ) . '</p>';
     205    $msg = '<p>' . 'If you suspect a problem please report it to the support forums but you must include the information asked for in the <a target="_blank" href="http://codex.wordpress.org/Debugging_WPMU">WPMU bug reporting guidelines</a>! ' . '</p>';
    206206
    207207    // @todo This file no longer exists post-merge.
    208208    if ( is_file( 'release-info.txt' ) ) {
    209         $msg .= '<p>' . __( 'Your bug report must include the following text:' ) . '</p>';
     209        $msg .= '<p>' . 'Your bug report must include the following text:' . '</p>';
    210210        $info = file( 'release-info.txt' );
    211211        $msg .= $info[ 4 ] . '"';
  • trunk/wp-includes/ms-settings.php

    r13421 r13575  
    111111        } else {
    112112            $msg = ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) ? ' ' . __( 'Database tables are missing.' ) : '';
    113             wp_die( __( 'No blog by that name on this system.' ) . $msg );
     113            wp_die( 'No blog by that name on this system.' . $msg );
    114114        }
    115115    }
Note: See TracChangeset for help on using the changeset viewer.