Changeset 55620

Timestamp:

04/04/2023 02:54:31 PM (22 months ago)

Author:

SergeyBiryukov

Message:

General: Remove Windows Live Writer manifest file.

The XML manifest was originally added in WordPress 2.3.1 to turn on tagging support in Windows Live Writer.

Given that the last major release of the software came out in 2012, and it was completely discontinued in January 2017, including this file in core no longer provides any benefit.

Follow-up to [6192], [49904].

Props joostdevalk, ayeshrajans, flixos90, jhabdas, frank-klein, wtranch, SergeyBiryukov.
Fixes #41404.

Location:

trunk

Files:

• src/wp-includes/default-filters.php (modified) (1 diff)
• src/wp-includes/deprecated.php (modified) (1 diff)
• src/wp-includes/general-template.php (modified) (1 diff)
• src/wp-includes/https-detection.php (modified) (1 diff)
• src/wp-includes/images/wlw (deleted)
• src/wp-includes/wlwmanifest.xml (deleted)
• tests/phpunit/tests/https-detection.php (modified) (2 diffs)

trunk/src/wp-includes/default-filters.php

@@ -329 +329 @@
 add_action( 'wp_head', 'feed_links_extra', 3 );
 add_action( 'wp_head', 'rsd_link' );
-add_action( 'wp_head', 'wlwmanifest_link' );
 add_action( 'wp_head', 'locale_stylesheet' );
 add_action( 'publish_future_post', 'check_and_publish_future_post', 10, 1 );

trunk/src/wp-includes/deprecated.php

@@ -4628 +4628 @@
     );
 }
+
+/**
+ * Displays the link to the Windows Live Writer manifest file.
+ *
+ * @link https://msdn.microsoft.com/en-us/library/bb463265.aspx
+ * @since 2.3.1
+ * @deprecated 6.3.0 WLW manifest is no longer in use and no longer included in core,
+ *                   so the output from this function is removed.
+ */
+function wlwmanifest_link() {
+    _deprecated_function( __FUNCTION__, '6.3.0' );
+}

trunk/src/wp-includes/general-template.php

@@ -3374 +3374 @@
 
 /**
- * Displays the link to the Windows Live Writer manifest file.
- *
- * @link https://msdn.microsoft.com/en-us/library/bb463265.aspx
- * @since 2.3.1
- */
-function wlwmanifest_link() {
-    printf(
-        '<link rel="wlwmanifest" type="application/wlwmanifest+xml" href="%s" />' . "\n",
-        includes_url( 'wlwmanifest.xml' )
-    );
-}
-
-/**
  * Displays a referrer `strict-origin-when-cross-origin` meta tag.
  *

trunk/src/wp-includes/https-detection.php

@@ -209 +209 @@
     }
 
-    // 2. Check if HTML includes the site's Windows Live Writer manifest link.
-    if ( has_action( 'wp_head', 'wlwmanifest_link' ) ) {
-        // Try both HTTPS and HTTP since the URL depends on context.
-        $pattern = preg_replace( '#^https?:(?=//)#', '', includes_url( 'wlwmanifest.xml' ) ); // See wlwmanifest_link().
-        return false !== strpos( $html, $pattern );
-    }
-
-    // 3. Check if HTML includes the site's REST API link.
+    // 2. Check if HTML includes the site's REST API link.
     if ( has_action( 'wp_head', 'rest_output_link_wp_head' ) ) {
         // Try both HTTPS and HTTP since the URL depends on context.

trunk/tests/phpunit/tests/https-detection.php

@@ -200 +200 @@
      * @ticket 47577
      */
-    public function test_wp_is_local_html_output_via_wlwmanifest_link() {
-        remove_action( 'wp_head', 'rsd_link' );
-
-        // HTML includes WLW manifest link.
-        $head_tag = get_echo( 'wlwmanifest_link' );
-        $html     = $this->get_sample_html_string( $head_tag );
-        $this->assertTrue( wp_is_local_html_output( $html ) );
-
-        // HTML includes modified WLW manifest link but same URL.
-        $head_tag = str_replace( ' />', '>', get_echo( 'wlwmanifest_link' ) );
-        $html     = $this->get_sample_html_string( $head_tag );
-        $this->assertTrue( wp_is_local_html_output( $html ) );
-
-        // HTML includes WLW manifest link with alternative URL scheme.
-        $head_tag = get_echo( 'wlwmanifest_link' );
-        $head_tag = false !== strpos( $head_tag, 'https://' ) ? str_replace( 'https://', 'http://', $head_tag ) : str_replace( 'http://', 'https://', $head_tag );
-        $html     = $this->get_sample_html_string( $head_tag );
-        $this->assertTrue( wp_is_local_html_output( $html ) );
-
-        // HTML does not include WLW manifest link.
-        $html = $this->get_sample_html_string();
-        $this->assertFalse( wp_is_local_html_output( $html ) );
-    }
-
-    /**
-     * @ticket 47577
-     */
     public function test_wp_is_local_html_output_via_rest_link() {
         remove_action( 'wp_head', 'rsd_link' );
-        remove_action( 'wp_head', 'wlwmanifest_link' );
 
         // HTML includes REST API link.
@@ -257 +229 @@
     public function test_wp_is_local_html_output_cannot_determine() {
         remove_action( 'wp_head', 'rsd_link' );
-        remove_action( 'wp_head', 'wlwmanifest_link' );
         remove_action( 'wp_head', 'rest_output_link_wp_head' );