WordPress.org

Make WordPress Core

Ticket #26879: 26879-4.patch

File 26879-4.patch, 9.2 KB (added by noam@…, 7 years ago)

26879-4.patch

  • 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);
  • wp-admin/setup-config.php

     
    116116                setup_config_display_header();
    117117?>
    118118
    119 <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>
     119
     120<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>
    120121<ol>
    121122        <li><?php _e( 'Database name' ); ?></li>
    122123        <li><?php _e( 'Database username' ); ?></li>
     
    124125        <li><?php _e( 'Database host' ); ?></li>
    125126        <li><?php _e( 'Table prefix (if you want to run more than one WordPress in a single database)' ); ?></li>
    126127</ol>
    127 <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>
    128 <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>
     128<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>
     129<p><?php _e( "If you&#8217;re all ready&hellip;" ); ?></p>
    129130
    130131<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>
    131132<?php
     
    175176
    176177        $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>';
    177178
    178         if ( empty( $prefix ) )
    179                 wp_die( __( '<strong>ERROR</strong>: "Table Prefix" must not be empty.' . $tryagain_link ) );
    180 
     179        // Validate $prefix: it must not be empty
     180        if ( empty( $prefix ) ):
     181                $die  = '<h1 id="logo">' . __( "<a href='http://wordpress.org/'>WordPress</a>" ) . '</h1>';
     182                $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>';
     183                $die .= ( __( $tryagain_link ) );
     184                wp_die( $die, __( 'WordPress &rsaquo; Error' ) );
     185        endif;
     186               
    181187        // Validate $prefix: it can only contain letters, numbers and underscores.
    182         if ( preg_match( '|[^a-z0-9_]|i', $prefix ) )
    183                 wp_die( __( '<strong>ERROR</strong>: "Table Prefix" can only contain numbers, letters, and underscores.' . $tryagain_link ) );
     188        if ( preg_match( '|[^a-z0-9_]|i', $prefix ) ):
     189                $die  = '<h1 id="logo">' . __( "<a href='http://wordpress.org/'>WordPress</a>" ) . '</h1>';
     190                $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>';
     191                $die .= ( __( $tryagain_link ) );
     192                wp_die( $die, __( 'WordPress &rsaquo; Error' ) );
     193        endif;
    184194
    185195        // Test the db connection.
    186196        /**#@+
     
    264274                setup_config_display_header();
    265275?>
    266276<p><?php _e( "Sorry, but I can&#8217;t write the <code>wp-config.php</code> file." ); ?></p>
    267 <p><?php _e( 'You can create the <code>wp-config.php</code> manually and paste the following text into it.' ); ?></p>
     277<p><?php _e( 'Please create the <code>wp-config.php</code> manually and paste the following text into it.' ); ?></p>
    268278<textarea id="wp-config" cols="98" rows="15" class="code" readonly="readonly"><?php
    269279                foreach( $config_file as $line ) {
    270280                        echo htmlentities($line, ENT_COMPAT, 'UTF-8');
  • wp-includes/functions.php

     
    21922192                }
    21932193                body {
    21942194                        background: #fff;
    2195                         color: #333;
     2195                        color: #555;
    21962196                        font-family: "Open Sans", sans-serif;
    2197                         margin: 2em auto;
     2197                        margin: 8em auto;
    21982198                        padding: 1em 2em;
    21992199                        max-width: 700px;
     2200                        -webkit-font-smoothing: subpixel-antialiased;
    22002201                        -webkit-box-shadow: 0 1px 3px rgba(0,0,0,0.13);
    22012202                        box-shadow: 0 1px 3px rgba(0,0,0,0.13);
    22022203                }
     
    22092210                        padding: 0;
    22102211                        padding-bottom: 7px;
    22112212                }
    2212                 #error-page {
    2213                         margin-top: 50px;
    2214                 }
    22152213                #error-page p {
    22162214                        font-size: 14px;
    22172215                        line-height: 1.5;
    2218                         margin: 25px 0 20px;
     2216                        padding-bottom: 2px;
     2217                        /*margin: 25px 0 20px;*/
    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?ver=20131202');
     2229                        background-image: none, url('/wp-admin/images/wordpress-logo.svg?ver=20131107');
     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 ;
  • wp-includes/wp-db.php

     
    833833                if ( !@mysql_select_db( $db, $dbh ) ) {
    834834                        $this->ready = false;
    835835                        wp_load_translations_early();
    836                         $this->bail( sprintf( __( '<h1>Can&#8217;t select database</h1>
     836                        $this->bail( sprintf( __( '<h1 id="logo"><a href="http://wordpress.org/">WordPress</a></h1>
     837<h1>Can&#8217;t select database</h1>
    837838<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>
    838839<ul>
    839840<li>Are you sure it exists?</li>
     
    11551156                if ( !$this->dbh ) {
    11561157                        wp_load_translations_early();
    11571158                        $this->bail( sprintf( __( "
     1159<h1 id='logo'><a href='http://wordpress.org/'>WordPress</a></h1>
    11581160<h1>Error establishing a database connection</h1>
    11591161<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>
    11601162<ul>
  • 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        wp_die( $die, __( "Welcome to WordPress!" ) );
    6262}