Changeset 53815

Timestamp:

08/03/2022 12:18:22 PM (2 years ago)

Author:

audrasjb

Message:

Administration: Change default site tagline to an empty string.

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.

Location:

trunk

Files:

• src/wp-admin/includes/schema.php (modified) (2 diffs)
• src/wp-admin/options-general.php (modified) (1 diff)
• tests/phpunit/tests/feed/atom.php (modified) (2 diffs)
• tests/phpunit/tests/feed/rss2.php (modified) (2 diffs)
• tests/phpunit/tests/general/wpGetDocumentTitle.php (modified) (3 diffs)
• tests/qunit/fixtures/wp-api-generated.js (modified) (2 diffs)

trunk/src/wp-admin/includes/schema.php

@@ -402 +402 @@
         'home'                            => $guessurl,
         'blogname'                        => __( 'My Site' ),
-        /* translators: Site tagline. */
-        'blogdescription'                 => __( 'Just another WordPress site' ),
+        'blogdescription'                 => '',
         'users_can_register'              => 0,
         'admin_email'                     => 'you@example.com',
@@ -556 +555 @@
     // 3.0.0 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%/';
     }

trunk/src/wp-admin/options-general.php

@@ -67 +67 @@
 </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>
 <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>
 </tr>

trunk/tests/phpunit/tests/feed/atom.php

@@ -52 +52 @@
         }
 
+        // Assign a tagline option.
+        update_option( 'blogdescription', 'Just another WordPress site' );
+
     }
 
@@ -62 +65 @@
         $this->post_count   = (int) get_option( 'posts_per_rss' );
         $this->excerpt_only = get_option( 'rss_use_excerpt' );
+    }
+
+    /**
+     * Tear down.
+     */
+    public static function wpTearDownAfterClass() {
+        delete_option( 'blogdescription' );
     }
 

trunk/tests/phpunit/tests/feed/rss2.php

@@ -59 +59 @@
             wp_set_object_terms( $post, self::$category->slug, 'category' );
         }
+
+        // Assign a tagline option.
+        update_option( 'blogdescription', 'Just another WordPress site' );
+
     }
 
@@ -74 +78 @@
         $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
         create_initial_taxonomies();
+    }
+
+    /**
+     * Tear down.
+     */
+    public static function wpTearDownAfterClass() {
+        delete_option( 'blogdescription' );
     }
 

trunk/tests/phpunit/tests/general/wpGetDocumentTitle.php

@@ -61 +61 @@
         $this->go_to( '/' );
 
+        $this->expectOutputString( sprintf( "<title>%s</title>\n", $this->blog_name ) );
+        _wp_render_title_tag();
+    }
+
+    /**
+     * @ticket 6479
+     */
+    public function test__wp_render_title_tag_with_blog_description() {
+        $this->go_to( '/' );
+
+        update_option( 'blogdescription', 'A blog description' );
+
         $this->expectOutputString( sprintf( "<title>%s &#8211; %s</title>\n", $this->blog_name, get_option( 'blogdescription' ) ) );
         _wp_render_title_tag();
@@ -100 +112 @@
 
         $this->go_to( '/' );
-        $this->assertSame( sprintf( '%s &#8211; Just another WordPress site', $this->blog_name ), wp_get_document_title() );
+        $this->assertSame( sprintf( '%s', $this->blog_name ), wp_get_document_title() );
 
         update_option( 'show_on_front', 'posts' );
 
         $this->go_to( '/' );
-        $this->assertSame( sprintf( '%s &#8211; Just another WordPress site', $this->blog_name ), wp_get_document_title() );
+        $this->assertSame( sprintf( '%s', $this->blog_name ), wp_get_document_title() );
     }
 
@@ -136 +148 @@
         add_filter( 'document_title_parts', array( $this, 'paged_title_parts' ) );
 
-        $this->assertSame( sprintf( '%s &#8211; Page 4 &#8211; Just another WordPress site', $this->blog_name ), wp_get_document_title() );
+        $this->assertSame( sprintf( '%s &#8211; Page 4', $this->blog_name ), wp_get_document_title() );
     }
 

trunk/tests/qunit/fixtures/wp-api-generated.js

@@ -8 +8 @@
 mockedApiResponse.Schema = {
     "name": "Test Blog",
-    "description": "Just another WordPress site",
+    "description": "",
     "url": "http://example.org",
     "home": "http://example.org",
@@ -12287 +12287 @@
 mockedApiResponse.settings = {
     "title": "Test Blog",
-    "description": "Just another WordPress site",
+    "description": "",
     "url": "http://example.org",
     "email": "admin@example.org",