Make WordPress Core

Changeset 53815


Ignore:
Timestamp:
08/03/2022 12:18:22 PM (21 months 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:
6 edited

Legend:

Unmodified
Added
Removed
  • trunk/src/wp-admin/includes/schema.php

    r53083 r53815  
    402402        'home'                            => $guessurl,
    403403        'blogname'                        => __( 'My Site' ),
    404         /* translators: Site tagline. */
    405         'blogdescription'                 => __( 'Just another WordPress site' ),
     404        'blogdescription'                 => '',
    406405        'users_can_register'              => 0,
    407406        'admin_email'                     => 'you@example.com',
     
    556555    // 3.0.0 multisite.
    557556    if ( is_multisite() ) {
    558         /* translators: %s: Network title. */
    559         $defaults['blogdescription']     = sprintf( __( 'Just another %s site' ), get_network()->site_name );
    560557        $defaults['permalink_structure'] = '/%year%/%monthnum%/%day%/%postname%/';
    561558    }
  • trunk/src/wp-admin/options-general.php

    r53186 r53815  
    6767</tr>
    6868
     69<?php
     70/* translators: Site tagline. */
     71$sample_tagline = __( 'Just another WordPress site' );
     72if ( is_multisite() ) {
     73    /* translators: %s: Network title. */
     74    $sample_tagline = sprintf( __( 'Just another %s site' ), get_network()->site_name );
     75}
     76?>
    6977<tr>
    7078<th scope="row"><label for="blogdescription"><?php _e( 'Tagline' ); ?></label></th>
    71 <td><input name="blogdescription" type="text" id="blogdescription" aria-describedby="tagline-description" value="<?php form_option( 'blogdescription' ); ?>" class="regular-text" />
     79<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; ?>" />
    7280<p class="description" id="tagline-description"><?php _e( 'In a few words, explain what this site is about.' ); ?></p></td>
    7381</tr>
  • trunk/tests/phpunit/tests/feed/atom.php

    r52267 r53815  
    5252        }
    5353
     54        // Assign a tagline option.
     55        update_option( 'blogdescription', 'Just another WordPress site' );
     56
    5457    }
    5558
     
    6265        $this->post_count   = (int) get_option( 'posts_per_rss' );
    6366        $this->excerpt_only = get_option( 'rss_use_excerpt' );
     67    }
     68
     69    /**
     70     * Tear down.
     71     */
     72    public static function wpTearDownAfterClass() {
     73        delete_option( 'blogdescription' );
    6474    }
    6575
  • trunk/tests/phpunit/tests/feed/rss2.php

    r53241 r53815  
    5959            wp_set_object_terms( $post, self::$category->slug, 'category' );
    6060        }
     61
     62        // Assign a tagline option.
     63        update_option( 'blogdescription', 'Just another WordPress site' );
     64
    6165    }
    6266
     
    7478        $this->set_permalink_structure( '/%year%/%monthnum%/%day%/%postname%/' );
    7579        create_initial_taxonomies();
     80    }
     81
     82    /**
     83     * Tear down.
     84     */
     85    public static function wpTearDownAfterClass() {
     86        delete_option( 'blogdescription' );
    7687    }
    7788
  • trunk/tests/phpunit/tests/general/wpGetDocumentTitle.php

    r52010 r53815  
    6161        $this->go_to( '/' );
    6262
     63        $this->expectOutputString( sprintf( "<title>%s</title>\n", $this->blog_name ) );
     64        _wp_render_title_tag();
     65    }
     66
     67    /**
     68     * @ticket 6479
     69     */
     70    public function test__wp_render_title_tag_with_blog_description() {
     71        $this->go_to( '/' );
     72
     73        update_option( 'blogdescription', 'A blog description' );
     74
    6375        $this->expectOutputString( sprintf( "<title>%s &#8211; %s</title>\n", $this->blog_name, get_option( 'blogdescription' ) ) );
    6476        _wp_render_title_tag();
     
    100112
    101113        $this->go_to( '/' );
    102         $this->assertSame( sprintf( '%s &#8211; Just another WordPress site', $this->blog_name ), wp_get_document_title() );
     114        $this->assertSame( sprintf( '%s', $this->blog_name ), wp_get_document_title() );
    103115
    104116        update_option( 'show_on_front', 'posts' );
    105117
    106118        $this->go_to( '/' );
    107         $this->assertSame( sprintf( '%s &#8211; Just another WordPress site', $this->blog_name ), wp_get_document_title() );
     119        $this->assertSame( sprintf( '%s', $this->blog_name ), wp_get_document_title() );
    108120    }
    109121
     
    136148        add_filter( 'document_title_parts', array( $this, 'paged_title_parts' ) );
    137149
    138         $this->assertSame( sprintf( '%s &#8211; Page 4 &#8211; Just another WordPress site', $this->blog_name ), wp_get_document_title() );
     150        $this->assertSame( sprintf( '%s &#8211; Page 4', $this->blog_name ), wp_get_document_title() );
    139151    }
    140152
  • trunk/tests/qunit/fixtures/wp-api-generated.js

    r53589 r53815  
    88mockedApiResponse.Schema = {
    99    "name": "Test Blog",
    10     "description": "Just another WordPress site",
     10    "description": "",
    1111    "url": "http://example.org",
    1212    "home": "http://example.org",
     
    1228712287mockedApiResponse.settings = {
    1228812288    "title": "Test Blog",
    12289     "description": "Just another WordPress site",
     12289    "description": "",
    1229012290    "url": "http://example.org",
    1229112291    "email": "admin@example.org",
Note: See TracChangeset for help on using the changeset viewer.