Changeset 13622 for trunk/wp-includes/ms-load.php

Timestamp:

03/09/2010 06:14:42 AM (15 years ago)

Author:

nacin

Message:

Allow localhost in a multisite subdirectory install. More network.php improvements. see #12457 for localhost. see #11816

File:

• trunk/wp-includes/ms-load.php (modified) (4 diffs)

trunk/wp-includes/ms-load.php

@@ -183 +183 @@
  * Used when blog does not exist. Checks for a missing $wpdb->site table as well.
  *
+ * @todo update for 3.0, pare down, and i18n
+ *
  * @access private
  * @since 3.0.0
@@ -189 +191 @@
     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 = '<h1>' . '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'" ) )
@@ -196 +198 @@
     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 .= '<h1>' . '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>';
@@ -205 +207 @@
     $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>';
-
-    // @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>';
-        $info = file( 'release-info.txt' );
-        $msg .= $info[ 4 ] . '"';
-    }
+    $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>';
 
     die( $msg );