Ticket #22306: 22306.3.patch

wp-includes/ms-load.php

@@ -241 +241 @@
         $msg .= '<p>' . __( '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.' ) . '</p>';
         if ( false && !$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 should look at your database now.' ), $wpdb->site ) . '</p>';
+                $msg .= '<p><strong>' . __( 'Database tables are missing.' ) . '</strong> ' . sprintf( __( 'This means that MySQL is not running, WordPress was not installed properly, or someone deleted <code>%s</code>. You really should look at your database now.' ), $wpdb->site ) . '</p>';
         else
                 $msg .= '<p>' . sprintf( __( '<strong>Could not find site <code>%1$s</code>.</strong> Searched for table <code>%2$s</code> in database <code>%3$s</code>. Is that right?' ), rtrim( $domain . $path, '/' ), $wpdb->blogs, DB_NAME ) . '</p>';
         $msg .= '<p><strong>' . __( 'What do I do now?' ) . '</strong> ';

wp-includes/wp-db.php

@@ -1142 +1142 @@
 
                 if ( !$this->dbh ) {
                         wp_load_translations_early();
-                        $this->bail( sprintf( __( "
-<h1>Error establishing a database connection</h1>
+                        $this->bail( '<h1>' . __( 'Error establishing a database connection' ) . '</h1>' . sprintf( __( "
 <p>This either means that the username and password information in your <code>wp-config.php</code> file is incorrect or we can't contact the database server at <code>%s</code>. This could mean your host's database server is down.</p>
 <ul>
         <li>Are you sure you have the correct username and password?</li>

wp-signup.php

@@ -361 +361 @@
                 <ul id="noemail-tips">
                         <li><p><strong><?php _e( 'Wait a little longer. Sometimes delivery of email can be delayed by processes outside of our control.' ) ?></strong></p></li>
                         <li><p><?php _e( 'Check the junk or spam folder of your email client. Sometime emails wind up there by mistake.' ) ?></p></li>
-                        <li><?php printf( __( 'Have you entered your email correctly?  You have entered %s, if it&#8217;s incorrect, you will not receive your email.' ), $user_email ) ?></li>
+                        <li><?php printf( __( 'Have you entered your email correctly? You have entered %s, if it&#8217;s incorrect, you will not receive your email.' ), $user_email ) ?></li>
                 </ul>
         </p>
         <?php
@@ -427 +427 @@
                                 $newblog = get_blogaddress_by_name( $newblogname );
 
                                 if ( $active_signup == 'blog' || $active_signup == 'all' )
-                                        printf( __( '<p><em>The site you were looking for, <strong>%s</strong> does not exist, but you can create it now!</em></p>' ), $newblog );
+                                        printf( '<p><em>' . __( 'The site you were looking for, <strong>%s</strong> does not exist, but you can create it now!' ) . '</p></em>', $newblog );
                                 else
-                                        printf( __( '<p><em>The site you were looking for, <strong>%s</strong>, does not exist.</em></p>' ), $newblog );
+                                        printf( '<p><em>' . __( 'The site you were looking for, <strong>%s</strong>, does not exist.' ) . '</p></em>', $newblog );
                         }
                         break;
         }