Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-12-23 01:27:36 +01:00
Code Issues Projects Releases Wiki Activity

Administration: Change default site tagline to an empty string.

Browse Source 
This changeset replaces the default "Just another WordPress site" tagline with an empty string for new installations. The reasoning is:

1. Not all themes display the tagline;
2. Not everyone changes the default tagline;
3. When people don't see the tagline in their theme, they may not realize it is still visible in some places, like feeds.

The string "Just another WordPress site" and the related multisite string: "Just another {NETWORK} site" are now only used as a placeholder for the tagline admin option.

Props markjaquith, Denis-de-Bernardy, westi, RyanMurphy, kovshenin, SergeyBiryukov, chriscct7, tyxla, hyperbrand, karmatosed, lukecavanagh, melchoyce, boemedia, khag7, sabernhardt, audrasjb, peterwilsoncc, costdev, martinkrcho, rafiahmedd.
Fixes #6479.

Built from https://develop.svn.wordpress.org/trunk@53815


git-svn-id: http://core.svn.wordpress.org/trunk@53374 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
audrasjb 2022-08-03 12:20:16 +00:00
parent ef0c9211ca
commit 66d425d86a
3 changed files with 11 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
wp-admin/includes/schema.php
View File

@ -401,8 +401,7 @@ function populate_options( array $options = array() ) {
'siteurl' => $guessurl, 'siteurl' => $guessurl,
'home' => $guessurl, 'home' => $guessurl,
'blogname' => __( 'My Site' ), 'blogname' => __( 'My Site' ),
/* translators: Site tagline. */ 'blogdescription' => '',
'blogdescription' => __( 'Just another WordPress site' ),
'users_can_register' => 0, 'users_can_register' => 0,
'admin_email' => 'you@example.com', 'admin_email' => 'you@example.com',
/* translators: Default start of the week. 0 = Sunday, 1 = Monday. */ /* translators: Default start of the week. 0 = Sunday, 1 = Monday. */
@ -555,8 +554,6 @@ function populate_options( array $options = array() ) {
// 3.0.0 multisite. // 3.0.0 multisite.
if ( is_multisite() ) { if ( is_multisite() ) {
/* translators: %s: Network title. */
$defaults['blogdescription'] = sprintf( __( 'Just another %s site' ), get_network()->site_name );
$defaults['permalink_structure'] = '/%year%/%monthnum%/%day%/%postname%/'; $defaults['permalink_structure'] = '/%year%/%monthnum%/%day%/%postname%/';
} }

10
wp-admin/options-general.php
View File

@ -66,9 +66,17 @@ require_once ABSPATH . 'wp-admin/admin-header.php';
<td><input name="blogname" type="text" id="blogname" value="<?php form_option( 'blogname' ); ?>" class="regular-text" /></td> <td><input name="blogname" type="text" id="blogname" value="<?php form_option( 'blogname' ); ?>" class="regular-text" /></td>
</tr> </tr>
<?php
/* translators: Site tagline. */
$sample_tagline = __( 'Just another WordPress site' );
if ( is_multisite() ) {
/* translators: %s: Network title. */
$sample_tagline = sprintf( __( 'Just another %s site' ), get_network()->site_name );
}
?>
<tr> <tr>
<th scope="row"><label for="blogdescription"><?php _e( 'Tagline' ); ?></label></th> <th scope="row"><label for="blogdescription"><?php _e( 'Tagline' ); ?></label></th>
<td><input name="blogdescription" type="text" id="blogdescription" aria-describedby="tagline-description" value="<?php form_option( 'blogdescription' ); ?>" class="regular-text" /> <td><input name="blogdescription" type="text" id="blogdescription" aria-describedby="tagline-description" value="<?php form_option( 'blogdescription' ); ?>" class="regular-text" placeholder="<?php echo $sample_tagline; ?>" />
<p class="description" id="tagline-description"><?php _e( 'In a few words, explain what this site is about.' ); ?></p></td> <p class="description" id="tagline-description"><?php _e( 'In a few words, explain what this site is about.' ); ?></p></td>
</tr> </tr>

2
wp-includes/version.php
View File

@ -16,7 +16,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '6.1-alpha-53814'; $wp_version = '6.1-alpha-53815';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.