WordPress.org

Make WordPress Core

Ticket #26879: 26879-8.patch

File 26879-8.patch, 11.1 KB (added by mrtortai, 7 years ago)
  • src/wp-admin/css/install.css

     
    77        background: #fff;
    88        color: #555;
    99        font-family: "Open Sans", sans-serif;
    10         margin: 140px auto 25px;
    11         padding: 20px 20px 10px 20px;
     10        margin: 8em auto;
     11        padding: 1em 2em;
    1212        max-width: 700px;
    1313        -webkit-font-smoothing: subpixel-antialiased;
    1414        -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.13);
     
    187187
    188188#error-page code, .code {
    189189        font-family: Consolas, Monaco, monospace;
     190        background: aliceblue;
    190191}
    191192
    192193#pass-strength-result {
  • src/wp-admin/setup-config.php

     
    112112                setup_config_display_header();
    113113?>
    114114
    115 <p><?php _e( 'Welcome to WordPress. Before getting started, we need some information on the database. You will need to know the following items before proceeding.' ) ?></p>
     115<p><?php _e( "To get started, we need some information on the database. This information is available through your web host. If you don't have it, you'll need to get in touch with them. Here's what you need:" ) ?></p>
    116116<ol>
    117117        <li><?php _e( 'Database name' ); ?></li>
    118118        <li><?php _e( 'Database username' ); ?></li>
     
    120120        <li><?php _e( 'Database host' ); ?></li>
    121121        <li><?php _e( 'Table prefix (if you want to run more than one WordPress in a single database)' ); ?></li>
    122122</ol>
    123 <p><strong><?php _e( "If for any reason this automatic file creation doesn&#8217;t work, don&#8217;t worry. All this does is fill in the database information to a configuration file. You may also simply open <code>wp-config-sample.php</code> in a text editor, fill in your information, and save it as <code>wp-config.php</code>." ); ?></strong></p>
    124 <p><?php _e( "In all likelihood, these items were supplied to you by your Web Host. If you do not have this information, then you will need to contact them before you can continue. If you&#8217;re all ready&hellip;" ); ?></p>
     123<p><?php _e( "Once you fill in this information, WordPress will create a configuration file called wp-config.php. This connects WordPress with your database (that's where your content, settings, photos, and all that good stuff is stored). Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>." ); ?></p>
     124<p><?php _e( "If you&#8217;re all ready&hellip;" ); ?></p>
    125125
    126126<p class="step"><a href="setup-config.php?step=1<?php if ( isset( $_GET['noapi'] ) ) echo '&amp;noapi'; ?>" class="button button-large"><?php _e( 'Let&#8217;s go!' ); ?></a></p>
    127127<?php
     
    131131                setup_config_display_header();
    132132        ?>
    133133<form method="post" action="setup-config.php?step=2">
    134         <p><?php _e( "Below you should enter your database connection details. If you&#8217;re not sure about these, contact your host." ); ?></p>
     134        <p><?php _e( "Below you should enter your MySQL database connection details. If you&#8217;re not sure about these, contact your host." ); ?></p>
    135135        <table class="form-table">
    136136                <tr>
    137137                        <th scope="row"><label for="dbname"><?php _e( 'Database Name' ); ?></label></th>
    138138                        <td><input name="dbname" id="dbname" type="text" size="25" value="wordpress" /></td>
    139                         <td><?php _e( 'The name of the database you want to run WP in.' ); ?></td>
     139                        <td><?php _e( 'The name of the database you want to use with WordPress.' ); ?></td>
    140140                </tr>
    141141                <tr>
    142142                        <th scope="row"><label for="uname"><?php _e( 'User Name' ); ?></label></th>
    143143                        <td><input name="uname" id="uname" type="text" size="25" value="<?php echo htmlspecialchars( _x( 'username', 'example username' ), ENT_QUOTES ); ?>" /></td>
    144                         <td><?php _e( 'Your MySQL username' ); ?></td>
     144                        <td><?php _e( 'Your database username.' ); ?></td>
    145145                </tr>
    146146                <tr>
    147147                        <th scope="row"><label for="pwd"><?php _e( 'Password' ); ?></label></th>
    148148                        <td><input name="pwd" id="pwd" type="text" size="25" value="<?php echo htmlspecialchars( _x( 'password', 'example password' ), ENT_QUOTES ); ?>" /></td>
    149                         <td><?php _e( '&hellip;and your MySQL password.' ); ?></td>
     149                        <td><?php _e( 'Your database password.' ); ?></td>
    150150                </tr>
    151151                <tr>
    152152                        <th scope="row"><label for="dbhost"><?php _e( 'Database Host' ); ?></label></th>
     
    171171
    172172        $tryagain_link = '</p><p class="step"><a href="setup-config.php?step=1" onclick="javascript:history.go(-1);return false;" class="button button-large">' . __( 'Try again' ) . '</a>';
    173173
    174         if ( empty( $prefix ) )
    175                 wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' . $tryagain_link ) );
     174        // Validate $prefix: it must not be empty
     175                if ( empty( $prefix ) ):
     176                        $die  = '<h1 id="logo">' . __( "<a href='http://wordpress.org/'>WordPress</a>" ) . '</h1>';
     177                        $die .= '<p style="text-align: center;">' . __( "Oops, the Table Prefix field should not be empty. <br /> Please go back and try again. Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php#table_prefix'>We got it</a>." ) . '</p>';
     178                        $die .= ( __( $tryagain_link ) );
     179                        wp_die( $die, __( 'WordPress &rsaquo; Error' ) );
     180                endif;
    176181
    177182        // Validate $prefix: it can only contain letters, numbers and underscores.
    178         if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
    179                 wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' . $tryagain_link ) );
     183        if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ):
     184                        $die  = '<h1 id="logo">' . __( "<a href='http://wordpress.org/'>WordPress</a>" ) . '</h1>';
     185                        $die .= '<p style="text-align: center;">' . __( "Oops, the Table Prefix field can only contain numbers, letters, and underscores. <br />Please go back and try again. Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php#table_prefix'>We got it</a>." ) . '</p>';
     186                        $die .= ( __( $tryagain_link ) );
     187                        wp_die( $die, __( 'WordPress &rsaquo; Error' ) );
     188                endif;
    180189
    181190        // Test the db connection.
    182191        /**#@+
     
    259268        if ( ! is_writable(ABSPATH) ) :
    260269                setup_config_display_header();
    261270?>
    262 <p><?php _e( "Sorry, but I can&#8217;t write the <code>wp-config.php</code> file." ); ?></p>
    263 <p><?php _e( 'You can create the <code>wp-config.php</code> manually and paste the following text into it.' ); ?></p>
     271<p><?php _e( 'Please manually create a file called <code>wp-config.php</code> in the root directory where the rest of your WordPress files are located and copy and paste the following text into the file:' ); ?></p>
    264272<textarea id="wp-config" cols="98" rows="15" class="code" readonly="readonly"><?php
    265273                foreach( $config_file as $line ) {
    266274                        echo htmlentities($line, ENT_COMPAT, 'UTF-8');
  • src/wp-includes/functions.php

     
    21892189        <style type="text/css">
    21902190                html {
    21912191                        background: #eee;
     2192                        margin: 0 20px;
    21922193                }
    21932194                body {
    21942195                        background: #fff;
    2195                         color: #333;
     2196                        color: #555;
    21962197                        font-family: "Open Sans", sans-serif;
    2197                         margin: 2em auto;
     2198                        margin: 8em auto;
    21982199                        padding: 1em 2em;
    21992200                        max-width: 700px;
     2201                        -webkit-font-smoothing: subpixel-antialiased;
    22002202                        -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.13);
    22012203                        box-shadow: 0 1px 3px rgba(0,0,0,0.13);
    22022204                }
     
    22092211                        padding: 0;
    22102212                        padding-bottom: 7px;
    22112213                }
    2212                 #error-page {
    2213                         margin-top: 50px;
    2214                 }
    22152214                #error-page p {
    22162215                        font-size: 14px;
    22172216                        line-height: 1.5;
    2218                         margin: 25px 0 20px;
     2217                        padding-bottom: 2px;
    22192218                }
    22202219                #error-page code {
    22212220                        font-family: Consolas, Monaco, monospace;
    22222221                }
     2222                #logo {
     2223                        margin: 6px 0 14px 0;
     2224                        border-bottom: none;
     2225                        text-align:center;
     2226                }
     2227                #logo a {
     2228                        background-image: url('../wp-admin/images/w-logo-blue.png');
     2229                        background-image: none, url('../wp-admin/images/wordpress-logo.svg');
     2230                        background-size: 80px 80px;
     2231                        background-position: center top;
     2232                        background-repeat: no-repeat;
     2233                        color: #999;
     2234                        height: 80px;
     2235                        font-size: 20px;
     2236                        font-weight: normal;
     2237                        line-height: 1.3em;
     2238                        margin: -154px auto 25px;
     2239                        padding: 0;
     2240                        text-decoration: none;
     2241                        width: 80px;
     2242                        text-indent: -9999px;
     2243                        outline: none;
     2244                        overflow: hidden;
     2245                        display: block;
     2246                }
     2247
    22232248                ul li {
    22242249                        margin-bottom: 10px;
    22252250                        font-size: 14px ;
  • src/wp-includes/wp-db.php

     
    972972                        $this->ready = false;
    973973                        if ( ! did_action( 'template_redirect' ) ) {
    974974                                wp_load_translations_early();
    975                                 $this->bail( sprintf( __( '<h1>Can&#8217;t select database</h1>
     975                                $this->bail( sprintf( __( '<h1 id="logo"><a href="http://wordpress.org/">WordPress</a></h1>
     976                                <h1>Can&#8217;t select database</h1>
    976977<p>We were able to connect to the database server (which means your username and password is okay) but not able to select the <code>%1$s</code> database.</p>
    977978<ul>
    978979<li>Are you sure it exists?</li>
     
    13551356                        }
    13561357
    13571358                        $this->bail( sprintf( __( "
     1359<h1 id='logo'><a href='http://wordpress.org/'>WordPress</a></h1>
    13581360<h1>Error establishing a database connection</h1>
    13591361<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>
    13601362<ul>
  • src/wp-load.php

     
    5353        $path = wp_guess_url() . '/wp-admin/setup-config.php';
    5454
    5555        // Die with an error message
    56         $die  = __( "There doesn't seem to be a <code>wp-config.php</code> file. I need this before we can get started." ) . '</p>';
    57         $die .= '<p>' . __( "Need more help? <a href='http://codex.wordpress.org/Editing_wp-config.php'>We got it</a>." ) . '</p>';
    58         $die .= '<p>' . __( "You can create a <code>wp-config.php</code> file through a web interface, but this doesn't work for all server setups. The safest way is to manually create the file." ) . '</p>';
    59         $die .= '<p><a href="' . $path . '" class="button button-large">' . __( "Create a Configuration File" ) . '</a>';
    60 
    61         wp_die( $die, __( 'WordPress &rsaquo; Error' ) );
     56        $die  = '<h1 id="logo">' . __( "<a href='http://wordpress.org/'>WordPress</a>" ) . '</h1>';
     57        $die .= '<h1 style="text-align: center;">' . __( "Welcome to WordPress!" ) . '</h1>';
     58        $die .= '<p>' . __( "WordPress is web software you can use to create a beautiful website, blog, or almost <a href='http://wordpress.org/showcase/'>anything you can imagine</a>. The core software is built by hundreds of community volunteers, and there are thousands of <a href='http://wordpress.org/plugins/'>plugins</a> and <a href='http://wordpress.org/themes/'>themes</a> available to transform your site." ) . '</p>';
     59        $die .= '<p style="text-align: center;">' . __( "We'd love you to join the family." ) . '</p>';
     60        $die .= '<p style="text-align: center;"><a href="' . $path . '" class="button button-large">' . __( "Let's Get Started!" ) . '</a>';
     61       
     62        wp_die( $die, __( "Welcome to WordPress!" ) );
    6263}