Ticket #18770: 18770-zeo.diff

wp-admin/maint/repair.php

@@ -1 +1 @@
 <?php
-
 define('WP_REPAIRING', true);
 
 require_once('../../wp-load.php');
@@ -17 +16 @@
 <h1 id="logo"><img alt="WordPress" src="../images/wordpress-logo.png" /></h1>
 
 <?php
-
 if ( !defined('WP_ALLOW_REPAIR') ) {
-        echo '<p>'.__('To allow use of this page to automatically repair database problems, please add the following line to your wp-config.php file.  Once this line is added to your config, reload this page.')."</p><code>define('WP_ALLOW_REPAIR', true);</code>";
+        echo '<p>' .__( 'To allow use of this page to automatically repair database problems, please add the following line to your <code>wp-config.php</code> file. Once this line is added to your config, reload this page.' ) . '</p>';
+        echo "<p><code>define('WP_ALLOW_REPAIR', true);</code></p>";
 } elseif ( isset($_GET['repair']) ) {
         check_admin_referer('repair_db');
 
@@ -46 +45 @@
                 echo '<p>';
                 if ( 'OK' == $check->Msg_text ) {
                         /* translators: %s: table name */
-                        printf( __( 'The %s table is okay.' ), $table );
+                        printf( __( 'The %s table is okay.' ), "<code>$table</code>" );
                 } else {
                         /* translators: 1: table name, 2: error message, */
-                        printf( __( 'The %1$s table is not okay. It is reporting the following error: %2$s.  WordPress will attempt to repair this table&hellip;' ) , $table, "<code>$check->Msg_text</code>" );
+                        printf( __( 'The %1$s table is not okay. It is reporting the following error: %2$s. WordPress will attempt to repair this table&hellip;' ), "<code>$table</code>", "<code>$check->Msg_text</code>" );
 
                         $repair = $wpdb->get_row("REPAIR TABLE $table");
 
                         echo '<br />&nbsp;&nbsp;&nbsp;&nbsp;';
                         if ( 'OK' == $check->Msg_text ) {
                                 /* translators: %s: table name */
-                                printf( __( 'Successfully repaired the %s table.' ), $table );
+                                printf( __( 'Successfully repaired the %s table.' ), "<code>$table</code>" );
                         } else {
                                 /* translators: 1: table name, 2: error message, */
-                                echo sprintf( __( 'Failed to repair the  %1$s table. Error: %2$s' ), $table, "<code>$check->Msg_text</code>" ) . '<br />';
+                                echo sprintf( __( 'Failed to repair the %1$s table. Error: %2$s' ), "<code>$table</code>", "<code>$check->Msg_text</code>" ) . '<br />';
                                 $problems[$table] = $check->Msg_text;
                                 $okay = false;
                         }
@@ -68 +67 @@
                 if ( $okay && $optimize ) {
                         $check = $wpdb->get_row("ANALYZE TABLE $table");
 
-                        echo '<br />&nbsp;&nbsp;&nbsp;&nbsp';
+                        echo '<br />&nbsp;&nbsp;&nbsp;&nbsp;';
                         if ( 'Table is already up to date' == $check->Msg_text )  {
                                 /* translators: %s: table name */
-                                printf( __( 'The %s table is already optimized.' ), $table );
+                                printf( __( 'The %s table is already optimized.' ), "<code>$table</code>" );
                         } else {
                                 $check = $wpdb->get_row("OPTIMIZE TABLE $table");
 
-                                echo '<br />&nbsp;&nbsp;&nbsp;&nbsp';
+                                echo '<br />&nbsp;&nbsp;&nbsp;&nbsp;';
                                 if ( 'OK' == $check->Msg_text || 'Table is already up to date' == $check->Msg_text ) {
                                         /* translators: %s: table name */
-                                        printf( __( 'Successfully optimized the %s table.' ), $table );
+                                        printf( __( 'Successfully optimized the %s table.' ), "<code>$table</code>" );
                                 } else {
                                         /* translators: 1: table name, 2: error message, */
-                                        printf( __( 'Failed to optimize the %1$s table. Error: %2$s' ), $table, "<code>$check->Msg_text</code>" );
+                                        printf( __( 'Failed to optimize the %1$s table. Error: %2$s' ), "<code>$table</code>", "<code>$check->Msg_text</code>" );
                                 }
                         }
                 }
@@ -89 +88 @@
         }
 
         if ( !empty($problems) ) {
-                printf('<p>'.__('Some database problems could not be repaired. Please copy-and-paste the following list of errors to the <a href="%s">WordPress support forums</a> to get additional assistance.').'</p>', 'http://wordpress.org/support/forum/3');
+                echo '<p>' . __( 'Some database problems could not be repaired. Please copy-and-paste the following list of errors to the <a href="http://wordpress.org/support/forum/3">WordPress support forums</a> to get additional assistance.' ) . '</p>';
                 $problem_output = array();
                 foreach ( $problems as $table => $problem )
                         $problem_output[] = "$table: $problem";
-                echo '<textarea name="errors" id="errors" rows="20" cols="60">' . esc_textarea( implode("\n", $problem_output) ) . '</textarea>';
+                echo '<p><textarea name="errors" id="errors" rows="20" cols="60">' . esc_textarea( implode("\n", $problem_output) ) . '</textarea></p>';
         } else {
-                echo '<p>'.__('Repairs complete.  Please remove the following line from wp-config.php to prevent this page from being used by unauthorized users.')."</p><code>define('WP_ALLOW_REPAIR', true);</code>";
+                echo '<p>' . __( 'Repairs complete. Please remove the following line from <code>wp-config.php</code> to prevent this page from being used by unauthorized users.' ) . '</p>';
+                echo "<p><code>define('WP_ALLOW_REPAIR', true);</code></p>";
         }
 } else {
         if ( isset($_GET['referrer']) && 'is_blog_installed' == $_GET['referrer'] )
-                _e('One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the &#8220;Repair Database&#8221; button. Repairing can take a while, so please be patient.');
+                echo '<p>' . __( 'One or more database tables are unavailable. To allow WordPress to attempt to repair these tables, press the &#8220;Repair Database&#8221; button. Repairing can take a while, so please be patient.' ) . '</p>';
         else
-                _e('WordPress can automatically look for some common database problems and repair them.  Repairing can take a while, so please be patient.')
+                echo '<p>' . __( 'WordPress can automatically look for some common database problems and repair them. Repairing can take a while, so please be patient.' ) . '</p>';
 ?>
         <p class="step"><a class="button" href="<?php echo wp_nonce_url('repair.php?repair=1', 'repair_db') ?>"><?php _e( 'Repair Database' ); ?></a></p>
-        <?php _e('WordPress can also attempt to optimize the database.  This improves performance in some situations.  Repairing and optimizing the database can take a long time and the database will be locked while optimizing.'); ?>
+        <p><?php _e( 'WordPress can also attempt to optimize the database. This improves performance in some situations. Repairing and optimizing the database can take a long time and the database will be locked while optimizing.' ); ?></p>
         <p class="step"><a class="button" href="<?php echo wp_nonce_url('repair.php?repair=2', 'repair_db') ?>"><?php _e( 'Repair and Optimize Database' ); ?></a></p>
 <?php
 }
 ?>
+
 </body>
 </html>