<!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>[55942] trunk: General: Replace some instances of "blog" with "site" in documentation, translator comments, and user-facing text strings.</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/55942">55942</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/55942","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>johnbillion</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-06-19 18:26:01 +0000 (Mon, 19 Jun 2023)</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'>General: Replace some instances of "blog" with "site" in documentation, translator comments, and user-facing text strings.
This is not an exhaustive change, but it gets us closer to using "site" in place of "blog" in as many places as possible.
Props NekoJonez, audrasjb, oglekler
Fixes <a href="https://core.trac.wordpress.org/ticket/58117">#58117</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmineditcommentsphp">trunk/src/wp-admin/edit-comments.php</a></li>
<li><a href="#trunksrcwpadminincludesexportphp">trunk/src/wp-admin/includes/export.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentyelevenheaderphp">trunk/src/wp-content/themes/twentyeleven/header.php</a></li>
<li><a href="#trunksrcwpcontentthemestwentytenheaderphp">trunk/src/wp-content/themes/twentyten/header.php</a></li>
<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
<li><a href="#trunksrcwpincludesmsblogsphp">trunk/src/wp-includes/ms-blogs.php</a></li>
<li><a href="#trunksrcwpincludesmsdeprecatedphp">trunk/src/wp-includes/ms-deprecated.php</a></li>
<li><a href="#trunksrcwpincludesmsfunctionsphp">trunk/src/wp-includes/ms-functions.php</a></li>
<li><a href="#trunksrcwpincludesthemecompatfooterphp">trunk/src/wp-includes/theme-compat/footer.php</a></li>
<li><a href="#trunksrcwpsignupphp">trunk/src/wp-signup.php</a></li>
<li><a href="#trunksrcwptrackbackphp">trunk/src/wp-trackback.php</a></li>
<li><a href="#trunktestsphpunittestscustomizemanagerphp">trunk/tests/phpunit/tests/customize/manager.php</a></li>
<li><a href="#trunktestsphpunittestsgeneralfeedLinksExtraphp">trunk/tests/phpunit/tests/general/feedLinksExtra.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmineditcommentsphp"></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/edit-comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-comments.php 2023-06-19 16:02:41 UTC (rev 55941)
+++ trunk/src/wp-admin/edit-comments.php 2023-06-19 18:26:01 UTC (rev 55942)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -216,7 +216,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'title' => __( 'Moderating Comments' ),
</span><span class="cx" style="display: block; padding: 0 10px"> 'content' =>
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'A red bar on the left means the comment is waiting for you to moderate it.' ) . '</p>' .
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- '<p>' . __( 'In the <strong>Author</strong> column, in addition to the author’s name, email address, and blog URL, the commenter’s IP address is shown. Clicking on this link will show you all the comments made from this IP address.' ) . '</p>' .
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ '<p>' . __( 'In the <strong>Author</strong> column, in addition to the author’s name, email address, and site URL, the commenter’s IP address is shown. Clicking on this link will show you all the comments made from this IP address.' ) . '</p>' .
</ins><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'In the <strong>Comment</strong> column, hovering over any comment gives you options to approve, reply (and approve), quick edit, edit, spam mark, or trash that comment.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'In the <strong>In response to</strong> column, there are three elements. The text is the name of the post that inspired the comment, and links to the post editor for that entry. The View Post link leads to that post on your live site. The small bubble with the number in it shows the number of approved comments that post has received. If there are pending comments, a red notification circle with the number of pending comments is displayed. Clicking the notification circle will filter the comments screen to show only pending comments on that post.' ) . '</p>' .
</span><span class="cx" style="display: block; padding: 0 10px"> '<p>' . __( 'In the <strong>Submitted on</strong> column, the date and time the comment was left on your site appears. Clicking on the date/time link will take you to that comment on your live site.' ) . '</p>' .
</span></span></pre></div>
<a id="trunksrcwpadminincludesexportphp"></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/export.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/export.php 2023-06-19 16:02:41 UTC (rev 55941)
+++ trunk/src/wp-admin/includes/export.php 2023-06-19 18:26:01 UTC (rev 55942)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -218,7 +218,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> // Multisite: the base URL.
</span><span class="cx" style="display: block; padding: 0 10px"> return network_home_url();
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // WordPress (single site): the blog URL.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // WordPress (single site): the site URL.
</ins><span class="cx" style="display: block; padding: 0 10px"> return get_bloginfo_rss( 'url' );
</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="trunksrcwpcontentthemestwentyelevenheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyeleven/header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyeleven/header.php 2023-06-19 16:02:41 UTC (rev 55941)
+++ trunk/src/wp-content/themes/twentyeleven/header.php 2023-06-19 18:26:01 UTC (rev 55942)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,10 +31,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_title( '|', true, 'right' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Add the blog name.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add the site name.
</ins><span class="cx" style="display: block; padding: 0 10px"> bloginfo( 'name' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Add the blog description for the home/front page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add the site description for the home/front page.
</ins><span class="cx" style="display: block; padding: 0 10px"> $site_description = get_bloginfo( 'description', 'display' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $site_description && ( is_home() || is_front_page() ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo " | $site_description";
</span></span></pre></div>
<a id="trunksrcwpcontentthemestwentytenheaderphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-content/themes/twentyten/header.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-content/themes/twentyten/header.php 2023-06-19 16:02:41 UTC (rev 55941)
+++ trunk/src/wp-content/themes/twentyten/header.php 2023-06-19 18:26:01 UTC (rev 55942)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -21,10 +21,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> wp_title( '|', true, 'right' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Add the blog name.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add the site name.
</ins><span class="cx" style="display: block; padding: 0 10px"> bloginfo( 'name' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Add the blog description for the home/front page.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Add the site description for the home/front page.
</ins><span class="cx" style="display: block; padding: 0 10px"> $site_description = get_bloginfo( 'description', 'display' );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( $site_description && ( is_home() || is_front_page() ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo " | $site_description";
</span></span></pre></div>
<a id="trunksrcwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/general-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/general-template.php 2023-06-19 16:02:41 UTC (rev 55941)
+++ trunk/src/wp-includes/general-template.php 2023-06-19 18:26:01 UTC (rev 55942)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3096,11 +3096,11 @@
</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"> $defaults = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Separator between blog name and feed type in feed links. */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Separator between site name and feed type in feed links. */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'separator' => _x( '»', 'feed link' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Blog title, 2: Separator (raquo). */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Site title, 2: Separator (raquo). */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'feedtitle' => __( '%1$s %2$s Feed' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Blog title, 2: Separator (raquo). */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Site title, 2: Separator (raquo). */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'comstitle' => __( '%1$s %2$s Comments Feed' ),
</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">@@ -3148,21 +3148,21 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function feed_links_extra( $args = array() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $defaults = array(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: Separator between blog name and feed type in feed links. */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: Separator between site name and feed type in feed links. */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'separator' => _x( '»', 'feed link' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Blog name, 2: Separator (raquo), 3: Post title. */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Site name, 2: Separator (raquo), 3: Post title. */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'singletitle' => __( '%1$s %2$s %3$s Comments Feed' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Blog name, 2: Separator (raquo), 3: Category name. */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Site name, 2: Separator (raquo), 3: Category name. */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'cattitle' => __( '%1$s %2$s %3$s Category Feed' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Blog name, 2: Separator (raquo), 3: Tag name. */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Site name, 2: Separator (raquo), 3: Tag name. */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'tagtitle' => __( '%1$s %2$s %3$s Tag Feed' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Blog name, 2: Separator (raquo), 3: Term name, 4: Taxonomy singular name. */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Site name, 2: Separator (raquo), 3: Term name, 4: Taxonomy singular name. */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'taxtitle' => __( '%1$s %2$s %3$s %4$s Feed' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Blog name, 2: Separator (raquo), 3: Author name. */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Site name, 2: Separator (raquo), 3: Author name. */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'authortitle' => __( '%1$s %2$s Posts by %3$s Feed' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Blog name, 2: Separator (raquo), 3: Search query. */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Site name, 2: Separator (raquo), 3: Search query. */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'searchtitle' => __( '%1$s %2$s Search Results for “%3$s” Feed' ),
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Blog name, 2: Separator (raquo), 3: Post type name. */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Site name, 2: Separator (raquo), 3: Post type name. */
</ins><span class="cx" style="display: block; padding: 0 10px"> 'posttypetitle' => __( '%1$s %2$s %3$s Feed' ),
</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="trunksrcwpincludesmsblogsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-blogs.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-blogs.php 2023-06-19 16:02:41 UTC (rev 55941)
+++ trunk/src/wp-includes/ms-blogs.php 2023-06-19 18:26:01 UTC (rev 55942)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -31,12 +31,12 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Gets a full blog URL, given a blog ID.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Gets a full site URL, given a site ID.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since MU (3.0.0)
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $blog_id Blog ID.
- * @return string Full URL of the blog if found. Empty string if not.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $blog_id Site ID.
+ * @return string Full site URL if found. Empty string if not.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_blogaddress_by_id( $blog_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $bloginfo = get_site( (int) $blog_id );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -52,7 +52,7 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Gets a full blog URL, given a blog name.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Gets a full site URL, given a site name.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since MU (3.0.0)
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre></div>
<a id="trunksrcwpincludesmsdeprecatedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-deprecated.php 2023-06-19 16:02:41 UTC (rev 55941)
+++ trunk/src/wp-includes/ms-deprecated.php 2023-06-19 18:26:01 UTC (rev 55942)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -355,7 +355,7 @@
</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><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Get a full blog URL, given a domain and a path.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Get a full site URL, given a domain and a path.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since MU (3.0.0)
</span><span class="cx" style="display: block; padding: 0 10px"> * @deprecated 3.7.0
</span></span></pre></div>
<a id="trunksrcwpincludesmsfunctionsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/ms-functions.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-functions.php 2023-06-19 16:02:41 UTC (rev 55941)
+++ trunk/src/wp-includes/ms-functions.php 2023-06-19 18:26:01 UTC (rev 55942)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -604,12 +604,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb WordPress database abstraction object.
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $domain
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $blogname The blog name provided by the user. Must be unique.
- * @param string $blog_title The blog title provided by the user.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $blogname The site name provided by the user. Must be unique.
+ * @param string $blog_title The site title provided by the user.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param WP_User|string $user Optional. The user object to check against the new site name.
</span><span class="cx" style="display: block; padding: 0 10px"> * Default empty string.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return array {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Array of domain, path, blog name, blog title, user and error messages.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Array of domain, path, site name, site title, user and error messages.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $domain Domain for the site.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $path Path for the site. Used in subdirectory installations.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -752,12 +752,12 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since MU (3.0.0)
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $result {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Array of domain, path, blog name, blog title, user and error messages.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Array of domain, path, site name, site title, user and error messages.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $domain Domain for the site.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $path Path for the site. Used in subdirectory installations.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $blogname The unique site name (slug).
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type string $blog_title Blog title.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string $blog_title Site title.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type string|WP_User $user By default, an empty string. A user object if provided.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type WP_Error $errors WP_Error containing any errors found.
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2387,7 +2387,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function filter_SSL( $url ) { // phpcs:ignore WordPress.NamingConventions.ValidFunctionName.FunctionNameInvalid
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_string( $url ) ) {
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- return get_bloginfo( 'url' ); // Return home blog URL with proper scheme.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ return get_bloginfo( 'url' ); // Return home site URL with proper scheme.
</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"> if ( force_ssl_content() && is_ssl() ) {
</span></span></pre></div>
<a id="trunksrcwpincludesthemecompatfooterphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/theme-compat/footer.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/theme-compat/footer.php 2023-06-19 16:02:41 UTC (rev 55941)
+++ trunk/src/wp-includes/theme-compat/footer.php 2023-06-19 18:26:01 UTC (rev 55942)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -22,7 +22,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <p>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> printf(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- /* translators: 1: Blog name, 2: WordPress */
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /* translators: 1: Site name, 2: WordPress */
</ins><span class="cx" style="display: block; padding: 0 10px"> __( '%1$s is proudly powered by %2$s' ),
</span><span class="cx" style="display: block; padding: 0 10px"> get_bloginfo( 'name' ),
</span><span class="cx" style="display: block; padding: 0 10px"> '<a href="https://wordpress.org/">WordPress</a>'
</span></span></pre></div>
<a id="trunksrcwpsignupphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-signup.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-signup.php 2023-06-19 16:02:41 UTC (rev 55941)
+++ trunk/src/wp-signup.php 2023-06-19 18:26:01 UTC (rev 55942)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -113,7 +113,7 @@
</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"> $current_network = get_network();
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- // Blog name.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // Site name.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_subdomain_install() ) {
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<label for="blogname">' . __( 'Site Name (subdirectory only):' ) . '</label>';
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span></span></pre></div>
<a id="trunksrcwptrackbackphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-trackback.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-trackback.php 2023-06-19 16:02:41 UTC (rev 55941)
+++ trunk/src/wp-trackback.php 2023-06-19 18:26:01 UTC (rev 55942)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -106,7 +106,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $charset Character set.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $title Trackback title.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $excerpt Trackback excerpt.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $blog_name Blog name.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $blog_name Site name.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'pre_trackback_post', $post_id, $trackback_url, $charset, $title, $excerpt, $blog_name );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunktestsphpunittestscustomizemanagerphp"></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/customize/manager.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/customize/manager.php 2023-06-19 16:02:41 UTC (rev 55941)
+++ trunk/tests/phpunit/tests/customize/manager.php 2023-06-19 18:26:01 UTC (rev 55942)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -764,7 +764,7 @@
</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"> * Test that adding blogname starter content is ignored now that it is modified,
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * but updating a non-modified starter content blog description passes.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * but updating a non-modified starter content site description passes.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> $previous_blogname = $changeset_data['blogname']['value'];
</span><span class="cx" style="display: block; padding: 0 10px"> $previous_blogdescription = $changeset_data['blogdescription']['value'];
</span></span></pre></div>
<a id="trunktestsphpunittestsgeneralfeedLinksExtraphp"></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/feedLinksExtra.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/general/feedLinksExtra.php 2023-06-19 16:02:41 UTC (rev 55941)
+++ trunk/tests/phpunit/tests/general/feedLinksExtra.php 2023-06-19 18:26:01 UTC (rev 55942)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -172,7 +172,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args {
</span><span class="cx" style="display: block; padding: 0 10px"> * Optional arguments. Default empty.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type string $separator The separator between blog name and feed type.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string $separator The separator between site name and feed type.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type string $singletitle The title of the comments feed.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $cattitle The title of the category feed.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $tagtitle The title of the tag feed.
</span></span></pre>
</div>
</div>
</body>
</html>