Changeset 60428

Timestamp:

07/07/2025 08:32:46 PM (8 days ago)

Author:

jorbin

Message:

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.

Reviewed by audrasjb.
Merges [60421] and [60422] to the 6.8 branch.

Props sabernhardt, peterwilsoncc, jorbin, bhubbard, matt.
Fixes #42007.

Location:

branches/6.8

Files:

• . (modified) (1 prop)
• src/wp-admin/includes/schema.php (modified) (1 diff)
• src/wp-admin/includes/upgrade.php (modified) (2 diffs)
• src/wp-includes/version.php (modified) (1 diff)
• tests/phpunit/tests/option/sanitizeOption.php (modified) (1 diff)

branches/6.8/src/wp-admin/includes/schema.php

@@ -447 +447 @@
         'active_plugins'                  => array(),
         'category_base'                   => '',
-        'ping_sites'                      => 'http://rpc.pingomatic.com/',
+        'ping_sites'                      => 'https://rpc.pingomatic.com/',
         'comment_max_links'               => 2,
         'gmt_offset'                      => $gmt_offset,

branches/6.8/src/wp-admin/includes/upgrade.php

@@ -882 +882 @@
         upgrade_670();
     }
+
+    if ( $wp_current_db_version < 60421 ) {
+        upgrade_682();
+    }
+
     maybe_disable_link_manager();
 
@@ -2440 +2445 @@
     }
 }
+
+/**
+ * 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 );
+    }
+}
+
 /**
  * Executes network-level upgrade routines.

branches/6.8/src/wp-includes/version.php

@@ -24 +24 @@
  * @global int $wp_db_version
  */
-$wp_db_version = 58975;
+$wp_db_version = 60421;
 
 /**

branches/6.8/tests/phpunit/tests/option/sanitizeOption.php

@@ -44 +44 @@
             array( 'date_format', 'F j, Y', 'F j, <strong>Y</strong>' ),
             array( 'ping_sites', 'http://rpc.pingomatic.com/', 'http://rpc.pingomatic.com/' ),
+            array( 'ping_sites', 'https://rpc.pingomatic.com/', 'https://rpc.pingomatic.com/' ),
             array( 'ping_sites', "http://www.example.com\nhttp://example.org", "www.example.com \n\texample.org\n\n" ),
             array( 'gmt_offset', '0', 0 ),