WordPress.org
Get WordPress

Make WordPress Core

Ticket #26879: 26879-3.patch

File 26879-3.patch, 6.6 KB (added by mrtortai, 11 years ago)

  • 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
    … …  
    264265                setup_config_display_header();
    265266?>
    266267<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>
     268<p><?php _e( 'Please create the <code>wp-config.php</code> manually and paste the following text into it.' ); ?></p>
    268269<textarea id="wp-config" cols="98" rows="15" class="code" readonly="readonly"><?php
    269270                foreach( $config_file as $line ) {
    270271                        echo htmlentities($line, ENT_COMPAT, 'UTF-8');

  • wp-includes/functions.php

     
    22102210                        padding-bottom: 7px;
    22112211                }
    22122212                #error-page {
    2213                         margin-top: 50px;
     2213                        margin-top: 134px;
    22142214                }
    22152215                #error-page p {
    22162216                        font-size: 14px;
    … …  
    22202220                #error-page code {
    22212221                        font-family: Consolas, Monaco, monospace;
    22222222                }
     2223                #logo {
     2224                        margin: 6px 0 14px 0;
     2225                        border-bottom: none;
     2226                        text-align:center;
     2227                }
     2228                #logo a {
     2229                        background-image: url('/wp-admin/images/w-logo-blue.png?ver=20131202');
     2230                        background-image: none, url('/wp-admin/images/wordpress-logo.svg?ver=20131107');
     2231                        background-size: 80px 80px;
     2232                        background-position: center top;
     2233                        background-repeat: no-repeat;
     2234                        color: #999;
     2235                        height: 80px;
     2236                        font-size: 20px;
     2237                        font-weight: normal;
     2238                        line-height: 1.3em;
     2239                        margin: -137px auto 10px;
     2240                        padding: 0;
     2241                        text-decoration: none;
     2242                        width: 80px;
     2243                        text-indent: -9999px;
     2244                        outline: none;
     2245                        overflow: hidden;
     2246                        display: block;
     2247                }
     2248
    22232249                ul li {
    22242250                        margin-bottom: 10px;
    22252251                        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}