<!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>[60421] trunk: Pings/Trackbacks: Use HTTPS for services that now support it.</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/60421">60421</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/60421","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>jorbin</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2025-07-07 18:04:00 +0000 (Mon, 07 Jul 2025)</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'>Pings/Trackbacks: Use HTTPS for services that now support it.

This updates the default on new installations for rpc.pingomatic.com to use https  while also upgrading existing sites that use rpc.pingomatic.com or rpc.twingly.com to use https for those two domains.

Props sabernhardt, peterwilsoncc, jorbin, bhubbard, matt.
Fixes <a href="https://core.trac.wordpress.org/ticket/42007">#42007</a>.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesschemaphp">trunk/src/wp-admin/includes/schema.php</a></li>
<li><a href="#trunksrcwpadminincludesupgradephp">trunk/src/wp-admin/includes/upgrade.php</a></li>
<li><a href="#trunksrcwpincludesversionphp">trunk/src/wp-includes/version.php</a></li>
<li><a href="#trunktestsphpunittestsoptionsanitizeOptionphp">trunk/tests/phpunit/tests/option/sanitizeOption.php</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    2025-07-07 17:07:55 UTC (rev 60420)
+++ trunk/src/wp-admin/includes/schema.php      2025-07-07 18:04:00 UTC (rev 60421)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -446,7 +446,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                'moderation_keys'                 => '',
</span><span class="cx" style="display: block; padding: 0 10px">                'active_plugins'                  => array(),
</span><span class="cx" style="display: block; padding: 0 10px">                'category_base'                   => '',
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-                'ping_sites'                      => 'http://rpc.pingomatic.com/',
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+         'ping_sites'                      => 'https://rpc.pingomatic.com/',
</ins><span class="cx" style="display: block; padding: 0 10px">                 'comment_max_links'               => 2,
</span><span class="cx" style="display: block; padding: 0 10px">                'gmt_offset'                      => $gmt_offset,
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span></span></pre></div>
<a id="trunksrcwpadminincludesupgradephp"></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/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/upgrade.php   2025-07-07 17:07:55 UTC (rev 60420)
+++ trunk/src/wp-admin/includes/upgrade.php     2025-07-07 18:04:00 UTC (rev 60421)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -881,6 +881,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">        if ( $wp_current_db_version < 58975 ) {
</span><span class="cx" style="display: block; padding: 0 10px">                upgrade_670();
</span><span class="cx" style="display: block; padding: 0 10px">        }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+       if ( $wp_current_db_version < 60421 ) {
+               upgrade_682();
+       }
+
</ins><span class="cx" style="display: block; padding: 0 10px">         maybe_disable_link_manager();
</span><span class="cx" style="display: block; padding: 0 10px"> 
</span><span class="cx" style="display: block; padding: 0 10px">        maybe_disable_automattic_widgets();
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2439,7 +2444,43 @@
</span><span class="cx" style="display: block; padding: 0 10px">                wp_set_options_autoload( $options, false );
</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">+
</ins><span class="cx" style="display: block; padding: 0 10px"> /**
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Executes changes made in WordPress 6.8.2.
+ *
+ * @ignore
+ * @since 6.8.2
+ *
+ * @global int $wp_current_db_version The old (current) database version.
+ */
+function upgrade_682() {
+       global $wp_current_db_version;
+
+       if ( $wp_current_db_version < 60421 ) {
+               // Upgrade Ping-O-Matic and Twingly to use HTTPS.
+               $ping_sites_value = get_option( 'ping_sites' );
+               $ping_sites_value = explode( "\n", $ping_sites_value );
+               $ping_sites_value = array_map(
+                       function ( $url ) {
+                               $url = trim( $url );
+                               $url = sanitize_url( $url );
+                               if (
+                                       str_ends_with( trailingslashit( $url ), '://rpc.pingomatic.com/' )
+                                       || str_ends_with( trailingslashit( $url ), '://rpc.twingly.com/' )
+                               ) {
+                                       $url = set_url_scheme( $url, 'https' );
+                               }
+                               return $url;
+                       },
+                       $ping_sites_value
+               );
+               $ping_sites_value = array_filter( $ping_sites_value );
+               $ping_sites_value = implode( "\n", $ping_sites_value );
+               update_option( 'ping_sites', $ping_sites_value );
+       }
+}
+
+/**
</ins><span class="cx" style="display: block; padding: 0 10px">  * Executes network-level upgrade routines.
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @since 3.0.0
</span></span></pre></div>
<a id="trunksrcwpincludesversionphp"></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/version.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/version.php 2025-07-07 17:07:55 UTC (rev 60420)
+++ trunk/src/wp-includes/version.php   2025-07-07 18:04:00 UTC (rev 60421)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -23,7 +23,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">  *
</span><span class="cx" style="display: block; padding: 0 10px">  * @global int $wp_db_version
</span><span class="cx" style="display: block; padding: 0 10px">  */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-$wp_db_version = 58975;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+$wp_db_version = 60344;
</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">  * Holds the TinyMCE version.
</span></span></pre></div>
<a id="trunktestsphpunittestsoptionsanitizeOptionphp"></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/option/sanitizeOption.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/option/sanitizeOption.php       2025-07-07 17:07:55 UTC (rev 60420)
+++ trunk/tests/phpunit/tests/option/sanitizeOption.php 2025-07-07 18:04:00 UTC (rev 60421)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -43,6 +43,7 @@
</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'date_format', 'F j, Y', 'F j, Y' ),
</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'date_format', 'F j, Y', 'F j, <strong>Y</strong>' ),
</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'ping_sites', 'http://rpc.pingomatic.com/', 'http://rpc.pingomatic.com/' ),
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+                        array( 'ping_sites', 'https://rpc.pingomatic.com/', 'https://rpc.pingomatic.com/' ),
</ins><span class="cx" style="display: block; padding: 0 10px">                         array( 'ping_sites', "http://www.example.com\nhttp://example.org", "www.example.com \n\texample.org\n\n" ),
</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'gmt_offset', '0', 0 ),
</span><span class="cx" style="display: block; padding: 0 10px">                        array( 'gmt_offset', '1.5', '1.5' ),
</span></span></pre>
</div>
</div>

</body>
</html>