<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[53815] trunk: Administration: Change default site tagline to an empty string.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/53815">53815</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/53815","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>audrasjb</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-08-03 12:18:22 +0000 (Wed, 03 Aug 2022)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>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 <a href="https://core.trac.wordpress.org/ticket/6479">#6479</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesschemaphp">trunk/src/wp-admin/includes/schema.php</a></li>
<li><a href="#trunksrcwpadminoptionsgeneralphp">trunk/src/wp-admin/options-general.php</a></li>
<li><a href="#trunktestsphpunittestsfeedatomphp">trunk/tests/phpunit/tests/feed/atom.php</a></li>
<li><a href="#trunktestsphpunittestsfeedrss2php">trunk/tests/phpunit/tests/feed/rss2.php</a></li>
<li><a href="#trunktestsphpunittestsgeneralwpGetDocumentTitlephp">trunk/tests/phpunit/tests/general/wpGetDocumentTitle.php</a></li>
<li><a href="#trunktestsqunitfixtureswpapigeneratedjs">trunk/tests/qunit/fixtures/wp-api-generated.js</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesschemaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/includes/schema.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/schema.php 2022-08-03 10:05:22 UTC (rev 53814)
+++ trunk/src/wp-admin/includes/schema.php 2022-08-03 12:18:22 UTC (rev 53815)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -401,8 +401,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'siteurl' => $guessurl,
</span><span class="cx" style="display: block; padding: 0 10px"> 'home' => $guessurl,
</span><span class="cx" style="display: block; padding: 0 10px"> 'blogname' => __( 'My Site' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Site tagline. */
- 'blogdescription' => __( 'Just another WordPress site' ),
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ 'blogdescription' => '',
</ins><span class="cx" style="display: block; padding: 0 10px"> 'users_can_register' => 0,
</span><span class="cx" style="display: block; padding: 0 10px"> 'admin_email' => 'you@example.com',
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Default start of the week. 0 = Sunday, 1 = Monday. */
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -555,8 +554,6 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // 3.0.0 multisite.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( is_multisite() ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: %s: Network title. */
- $defaults['blogdescription'] = sprintf( __( 'Just another %s site' ), get_network()->site_name );
</del><span class="cx" style="display: block; padding: 0 10px"> $defaults['permalink_structure'] = '/%year%/%monthnum%/%day%/%postname%/';
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadminoptionsgeneralphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/options-general.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/options-general.php 2022-08-03 10:05:22 UTC (rev 53814)
+++ trunk/src/wp-admin/options-general.php 2022-08-03 12:18:22 UTC (rev 53815)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -66,9 +66,17 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <td><input name="blogname" type="text" id="blogname" value="<?php form_option( 'blogname' ); ?>" class="regular-text" /></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?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 );
+}
+?>
</ins><span class="cx" style="display: block; padding: 0 10px"> <tr>
</span><span class="cx" style="display: block; padding: 0 10px"> <th scope="row"><label for="blogdescription"><?php _e( 'Tagline' ); ?></label></th>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<td><input name="blogdescription" type="text" id="blogdescription" aria-describedby="tagline-description" value="<?php form_option( 'blogdescription' ); ?>" class="regular-text" />
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<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; ?>" />
</ins><span class="cx" style="display: block; padding: 0 10px"> <p class="description" id="tagline-description"><?php _e( 'In a few words, explain what this site is about.' ); ?></p></td>
</span><span class="cx" style="display: block; padding: 0 10px"> </tr>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestsfeedatomphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/feed/atom.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/feed/atom.php 2022-08-03 10:05:22 UTC (rev 53814)
+++ trunk/tests/phpunit/tests/feed/atom.php 2022-08-03 12:18:22 UTC (rev 53815)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -51,6 +51,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $post, self::$category->slug, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Assign a tagline option.
+ update_option( 'blogdescription', 'Just another WordPress site' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -64,6 +67,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tear down.
+ */
+ public static function wpTearDownAfterClass() {
+ delete_option( 'blogdescription' );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * This is a bit of a hack used to buffer feed content.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private function do_atom() {
</span></span></pre></div>
<a id="trunktestsphpunittestsfeedrss2php"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/feed/rss2.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/feed/rss2.php 2022-08-03 10:05:22 UTC (rev 53814)
+++ trunk/tests/phpunit/tests/feed/rss2.php 2022-08-03 12:18:22 UTC (rev 53815)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -58,6 +58,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> foreach ( self::$posts as $post ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_set_object_terms( $post, self::$category->slug, 'category' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+ // Assign a tagline option.
+ update_option( 'blogdescription', 'Just another WordPress site' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -76,6 +80,13 @@
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Tear down.
+ */
+ public static function wpTearDownAfterClass() {
+ delete_option( 'blogdescription' );
+ }
+
+ /**
</ins><span class="cx" style="display: block; padding: 0 10px"> * This is a bit of a hack used to buffer feed content.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> private function do_rss2() {
</span></span></pre></div>
<a id="trunktestsphpunittestsgeneralwpGetDocumentTitlephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/phpunit/tests/general/wpGetDocumentTitle.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/general/wpGetDocumentTitle.php 2022-08-03 10:05:22 UTC (rev 53814)
+++ trunk/tests/phpunit/tests/general/wpGetDocumentTitle.php 2022-08-03 12:18:22 UTC (rev 53815)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -60,6 +60,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> public function test__wp_render_title_tag() {
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $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' );
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $this->expectOutputString( sprintf( "<title>%s – %s</title>\n", $this->blog_name, get_option( 'blogdescription' ) ) );
</span><span class="cx" style="display: block; padding: 0 10px"> _wp_render_title_tag();
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -99,12 +111,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'document_title_parts', array( $this, 'front_page_title_parts' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( sprintf( '%s – Just another WordPress site', $this->blog_name ), wp_get_document_title() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( sprintf( '%s', $this->blog_name ), wp_get_document_title() );
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> update_option( 'show_on_front', 'posts' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $this->go_to( '/' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( sprintf( '%s – Just another WordPress site', $this->blog_name ), wp_get_document_title() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( sprintf( '%s', $this->blog_name ), wp_get_document_title() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function front_page_title_parts( $parts ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,7 +147,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> add_filter( 'document_title_parts', array( $this, 'paged_title_parts' ) );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- $this->assertSame( sprintf( '%s – Page 4 – Just another WordPress site', $this->blog_name ), wp_get_document_title() );
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ $this->assertSame( sprintf( '%s – Page 4', $this->blog_name ), wp_get_document_title() );
</ins><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> public function paged_title_parts( $parts ) {
</span></span></pre></div>
<a id="trunktestsqunitfixtureswpapigeneratedjs"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/tests/qunit/fixtures/wp-api-generated.js</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/qunit/fixtures/wp-api-generated.js 2022-08-03 10:05:22 UTC (rev 53814)
+++ trunk/tests/qunit/fixtures/wp-api-generated.js 2022-08-03 12:18:22 UTC (rev 53815)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -7,7 +7,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> mockedApiResponse.Schema = {
</span><span class="cx" style="display: block; padding: 0 10px"> "name": "Test Blog",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "description": "Just another WordPress site",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "description": "",
</ins><span class="cx" style="display: block; padding: 0 10px"> "url": "http://example.org",
</span><span class="cx" style="display: block; padding: 0 10px"> "home": "http://example.org",
</span><span class="cx" style="display: block; padding: 0 10px"> "gmt_offset": "0",
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -12286,7 +12286,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> mockedApiResponse.settings = {
</span><span class="cx" style="display: block; padding: 0 10px"> "title": "Test Blog",
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "description": "Just another WordPress site",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "description": "",
</ins><span class="cx" style="display: block; padding: 0 10px"> "url": "http://example.org",
</span><span class="cx" style="display: block; padding: 0 10px"> "email": "admin@example.org",
</span><span class="cx" style="display: block; padding: 0 10px"> "timezone": "",
</span></span></pre>
</div>
</div>
</body>
</html>