Ticket #6479: 6479.patch

wp-admin/includes/upgrade.php

@@ -27 +27 @@
  * @since 2.1.0
  *
  * @param string $blog_title Blog title.
+ * @param string $blog_tagline Blog tagline/description
  * @param string $user_name User's username.
  * @param string $user_email User's email.
  * @param bool $public Whether blog is public.
@@ -34 +35 @@
  * @param string $user_password Optional. User's chosen password. Will default to a random password.
  * @return array Array keys 'url', 'user_id', 'password', 'password_message'.
  */
-function wp_install( $blog_title, $user_name, $user_email, $public, $deprecated = '', $user_password = '' ) {
+function wp_install( $blog_title, $blog_tagline, $user_name, $user_email, $public, $deprecated = '', $user_password = '' ) {
         global $wp_rewrite;
 
         if ( !empty( $deprecated ) )
@@ -47 +48 @@
         populate_roles();
 
         update_option('blogname', $blog_title);
+        update_option('blogdescription', $blog_tagline);
         update_option('admin_email', $user_email);
         update_option('blog_public', $public);
 

wp-admin/includes/schema.php

@@ -199 +199 @@
         'siteurl' => $guessurl,
         'blogname' => __('My Site'),
         /* translators: blog tagline */
-        'blogdescription' => __('Just another WordPress site'),
+        'blogdescription' => __(''),
         'users_can_register' => 0,
         'admin_email' => 'you@example.com',
         'start_of_week' => 1,

wp-admin/install.php

@@ -83 +83 @@
                 $blog_public = isset( $_POST['blog_public'] );
 
         $weblog_title = isset( $_POST['weblog_title'] ) ? trim( stripslashes( $_POST['weblog_title'] ) ) : '';
+        $weblog_tagline = isset( $_POST['weblog_tagline'] ) ? trim( stripslashes( $_POST['weblog_tagline'] ) ) : '';
         $user_name = isset($_POST['user_name']) ? trim( stripslashes( $_POST['user_name'] ) ) : 'admin';
         $admin_password = isset($_POST['admin_password']) ? trim( stripslashes( $_POST['admin_password'] ) ) : '';
         $admin_email  = isset( $_POST['admin_email']  ) ? trim( stripslashes( $_POST['admin_email'] ) ) : '';
@@ -98 +99 @@
                         <td><input name="weblog_title" type="text" id="weblog_title" size="25" value="<?php echo esc_attr( $weblog_title ); ?>" /></td>
                 </tr>
                 <tr>
+                        <th scope="row"><label for="weblog_tagline"><?php _e( 'Site Tagline' ); ?></label></th>
+                        <td><input name="weblog_tagline" type="text" id="weblog_tagline" size="25" value="<?php echo esc_attr( $weblog_tagline ); ?>" /></td>
+                </tr>
+                <tr>
                         <th scope="row"><label for="user_name"><?php _e('Username'); ?></label></th>
                         <td>
                         <?php
@@ -182 +187 @@
                 display_header();
                 // Fill in the data we gathered
                 $weblog_title = isset( $_POST['weblog_title'] ) ? trim( stripslashes( $_POST['weblog_title'] ) ) : '';
+                $weblog_tagline = isset( $_POST['weblog_tagline'] ) ? trim( stripslashes( $_POST['weblog_tagline'] ) ) : '';
                 $user_name = isset($_POST['user_name']) ? trim( stripslashes( $_POST['user_name'] ) ) : 'admin';
                 $admin_password = isset($_POST['admin_password']) ? $_POST['admin_password'] : '';
                 $admin_password_check = isset($_POST['admin_password2']) ? $_POST['admin_password2'] : '';
@@ -212 +218 @@
 
                 if ( $error === false ) {
                         $wpdb->show_errors();
-                        $result = wp_install($weblog_title, $user_name, $admin_email, $public, '', $admin_password);
+                        $result = wp_install($weblog_title, $weblog_tagline,  $user_name, $admin_email, $public, '', $admin_password);
                         extract( $result, EXTR_SKIP );
 ?>
-
+`       
 <h1><?php _e( 'Success!' ); ?></h1>
 
 <p><?php _e( 'WordPress has been installed. Were you expecting more steps? Sorry to disappoint.' ); ?></p>