From 0fd5fee45029ca7fbe5e7857ee9957d0672688e1 Mon Sep 17 00:00:00 2001 From: nacin Date: Wed, 28 Apr 2010 07:40:49 +0000 Subject: [PATCH] Better DNS error message in network.php. git-svn-id: http://svn.automattic.com/wordpress/trunk@14275 1a063a9b-81f0-0310-95a4-ce76da25c4cd --- wp-admin/includes/schema.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/wp-admin/includes/schema.php b/wp-admin/includes/schema.php index 97f05d616..20fb95a6a 100644 --- a/wp-admin/includes/schema.php +++ b/wp-admin/includes/schema.php @@ -756,11 +756,11 @@ Thanks! if ( ! $vhost_ok ) { $msg = '

' . __( 'Warning! Wildcard DNS may not be configured correctly!' ) . '

'; - $msg .= '

' . sprintf( __( 'To use a subdomain configuration, you must have a wildcard entry in your DNS. The installer attempted to contact a random hostname (%1$s) on your domain.' ), $hostname ); + $msg .= '

' . sprintf( __( 'The installer attempted to contact a random hostname (%1$s) on your domain.' ), $hostname ); if ( ! empty ( $errstr ) ) - $msg .= ' ' . sprintf( __( 'This resulted in an error message: %s' ), $errstr ); + $msg .= ' ' . sprintf( __( 'This resulted in an error message: %s' ), '' . $errstr . '' ); $msg .= '

'; - $msg .= '

' . __( 'If you want to host sites in the form of http://site1.example.com then you must add a wildcard record to your DNS records. This usually means adding a * hostname record pointing at your web server in your DNS configuration tool.' ) . '

'; + $msg .= '

' . _e( 'To use a subdomain configuration, you must have a wildcard entry in your DNS. This usually means adding a * hostname record pointing at your web server in your DNS configuration tool.' ) . '

'; $msg .= '

' . __( 'You can still use your site but any subdomain you create may not be accessible. If you know your DNS is correct, ignore this message.' ) . '

'; return new WP_Error( 'no_wildcard_dns', $msg ); }