WordPress.org

Make WordPress Core

Ticket #6479: 6479.patch

File 6479.patch, 3.9 KB (added by RyanMurphy, 7 years ago)
  • wp-admin/includes/upgrade.php

     
    2727 * @since 2.1.0
    2828 *
    2929 * @param string $blog_title Blog title.
     30 * @param string $blog_tagline Blog tagline/description
    3031 * @param string $user_name User's username.
    3132 * @param string $user_email User's email.
    3233 * @param bool $public Whether blog is public.
     
    3435 * @param string $user_password Optional. User's chosen password. Will default to a random password.
    3536 * @return array Array keys 'url', 'user_id', 'password', 'password_message'.
    3637 */
    37 function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated = '', $user_password = '' ) {
     38function wp_install( $blog_title, $blog_tagline, $user_name, $user_email, $public, $deprecated = '', $user_password = '' ) {
    3839        global $wp_rewrite;
    3940
    4041        if ( !empty( $deprecated ) )
     
    4748        populate_roles();
    4849
    4950        update_option('blogname', $blog_title);
     51        update_option('blogdescription', $blog_tagline);
    5052        update_option('admin_email', $user_email);
    5153        update_option('blog_public', $public);
    5254
  • wp-admin/includes/schema.php

     
    199199        'siteurl' => $guessurl,
    200200        'blogname' => __('My Site'),
    201201        /* translators: blog tagline */
    202         'blogdescription' => __('Just another WordPress site'),
     202        'blogdescription' => __(''),
    203203        'users_can_register' => 0,
    204204        'admin_email' => 'you@example.com',
    205205        'start_of_week' => 1,
  • wp-admin/install.php

     
    8383                $blog_public = isset( $_POST['blog_public'] );
    8484
    8585        $weblog_title = isset( $_POST['weblog_title'] ) ? trim( stripslashes( $_POST['weblog_title'] ) ) : '';
     86        $weblog_tagline = isset( $_POST['weblog_tagline'] ) ? trim( stripslashes( $_POST['weblog_tagline'] ) ) : '';
    8687        $user_name = isset($_POST['user_name']) ? trim( stripslashes( $_POST['user_name'] ) ) : 'admin';
    8788        $admin_password = isset($_POST['admin_password']) ? trim( stripslashes( $_POST['admin_password'] ) ) : '';
    8889        $admin_email  = isset( $_POST['admin_email']  ) ? trim( stripslashes( $_POST['admin_email'] ) ) : '';
     
    9899                        <td><input name="weblog_title" type="text" id="weblog_title" size="25" value="<?php echo esc_attr( $weblog_title ); ?>" /></td>
    99100                </tr>
    100101                <tr>
     102                        <th scope="row"><label for="weblog_tagline"><?php _e( 'Site Tagline' ); ?></label></th>
     103                        <td><input name="weblog_tagline" type="text" id="weblog_tagline" size="25" value="<?php echo esc_attr( $weblog_tagline ); ?>" /></td>
     104                </tr>
     105                <tr>
    101106                        <th scope="row"><label for="user_name"><?php _e('Username'); ?></label></th>
    102107                        <td>
    103108                        <?php
     
    182187                display_header();
    183188                // Fill in the data we gathered
    184189                $weblog_title = isset( $_POST['weblog_title'] ) ? trim( stripslashes( $_POST['weblog_title'] ) ) : '';
     190                $weblog_tagline = isset( $_POST['weblog_tagline'] ) ? trim( stripslashes( $_POST['weblog_tagline'] ) ) : '';
    185191                $user_name = isset($_POST['user_name']) ? trim( stripslashes( $_POST['user_name'] ) ) : 'admin';
    186192                $admin_password = isset($_POST['admin_password']) ? $_POST['admin_password'] : '';
    187193                $admin_password_check = isset($_POST['admin_password2']) ? $_POST['admin_password2'] : '';
     
    212218
    213219                if ( $error === false ) {
    214220                        $wpdb->show_errors();
    215                         $result = wp_install($weblog_title, $user_name, $admin_email, $public, '', $admin_password);
     221                        $result = wp_install($weblog_title, $weblog_tagline,  $user_name, $admin_email, $public, '', $admin_password);
    216222                        extract( $result, EXTR_SKIP );
    217223?>
    218 
     224`       
    219225<h1><?php _e( 'Success!' ); ?></h1>
    220226
    221227<p><?php _e( 'WordPress has been installed. Were you expecting more steps? Sorry to disappoint.' ); ?></p>