Changeset 13575

Timestamp:

03/03/2010 05:13:38 PM (15 years ago)

Author:

wpmuguru

Message:

remove ( calls from ms startup, see #11644

Location:

trunk/wp-includes

Files:

• ms-load.php (modified) (3 diffs)
• ms-settings.php (modified) (1 diff)

trunk/wp-includes/ms-load.php

@@ -171 +171 @@
     // @todo Update or remove WPMU codex link.
     if ( 1 == count( $sites ) )
-        wp_die( sprintf( __( 'That blog does not exist. Please try <a href="%s">%s</a>.' ), $sites[0]->domain . $sites[0]->path ) );
+        wp_die( sprintf( 'That blog does not exist. Please try <a href="%s">%s</a>.', $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 <a href="http://codex.wordpress.org/Debugging_WPMU">Debugging WPMU</a> for further assistance.' ) );
+        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.' );
 }
 
@@ -187 +187 @@
     global $wpdb, $domain, $path;
 
-    $msg = '<h1>' . esc_html__( 'Fatal Error' ) . '</h1>';
-    $msg  = '<p>' . __( 'If your site does not display, please contact the owner of this network.' ) . '</p>';
-    $msg .= '<p>' . __( 'If you are the owner of this network please check that MySQL is running properly and all tables are error free.' ) . '</p>';
+    $msg = '<h1>' . esc_html( 'Fatal Error' ) . '</h1>';
+    $msg  = '<p>' . 'If your site does not display, please contact the owner of this network.' . '</p>';
+    $msg .= '<p>' . 'If you are the owner of this network please check that MySQL is running properly and all tables are error free.' . '</p>';
     if ( ! $wpdb->get_var( "SHOW TABLES LIKE '$wpdb->site'" ) )
-        $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>';
+        $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>';
     else
-        $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>';
-    $msg .= '<h1>' . esc_html__( 'What do I do now?' ) . '</h1>';
+        $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>';
+    $msg .= '<h1>' . esc_html( 'What do I do now?' ) . '</h1>';
     // @todo Update WPMU codex link.
-    $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>';
-    $msg .= '<p>' . __( "If you're still stuck with this message, then check that your database contains the following tables:" ) . '</p><ul>';
+    $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>';
+    $msg .= '<p>' . "If you're still stuck with this message, then check that your database contains the following tables:" . '</p><ul>';
     foreach ( $wpdb->global_tables as $table ) {
         $msg .= '<li>' . $wpdb->prefix . $table . '</li>';
@@ -203 +203 @@
     $msg .= '</ul>';
     // @todo Update WPMU codex link and support instructions.
-    $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>';
+    $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>';
 
     // @todo This file no longer exists post-merge.
     if ( is_file( 'release-info.txt' ) ) {
-        $msg .= '<p>' . __( 'Your bug report must include the following text:' ) . '</p>';
+        $msg .= '<p>' . 'Your bug report must include the following text:' . '</p>';
         $info = file( 'release-info.txt' );
         $msg .= $info[ 4 ] . '"';

trunk/wp-includes/ms-settings.php

@@ -111 +111 @@
         } 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 );
         }
     }