<!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>[55620] trunk: General: Remove Windows Live Writer manifest file.</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/55620">55620</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/55620","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2023-04-04 14:54:31 +0000 (Tue, 04 Apr 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: 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 <a href="https://core.trac.wordpress.org/changeset/6192">[6192]</a>, <a href="https://core.trac.wordpress.org/changeset/49904">[49904]</a>.
Props joostdevalk, ayeshrajans, flixos90, jhabdas, frank-klein, wtranch, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/41404">#41404</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludesdefaultfiltersphp">trunk/src/wp-includes/default-filters.php</a></li>
<li><a href="#trunksrcwpincludesdeprecatedphp">trunk/src/wp-includes/deprecated.php</a></li>
<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
<li><a href="#trunksrcwpincludeshttpsdetectionphp">trunk/src/wp-includes/https-detection.php</a></li>
<li><a href="#trunktestsphpunittestshttpsdetectionphp">trunk/tests/phpunit/tests/https-detection.php</a></li>
</ul>
<h3>Removed Paths</h3>
<ul>
<li>trunk/src/wp-includes/images/wlw/</li>
<li><a href="#trunksrcwpincludeswlwmanifestxml">trunk/src/wp-includes/wlwmanifest.xml</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludesdefaultfiltersphp"></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/default-filters.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/default-filters.php 2023-04-04 10:04:45 UTC (rev 55619)
+++ trunk/src/wp-includes/default-filters.php 2023-04-04 14:54:31 UTC (rev 55620)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -328,7 +328,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', 'feed_links', 2 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', 'feed_links_extra', 3 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', 'rsd_link' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-add_action( 'wp_head', 'wlwmanifest_link' );
</del><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', 'locale_stylesheet' );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'publish_future_post', 'check_and_publish_future_post', 10, 1 );
</span><span class="cx" style="display: block; padding: 0 10px"> add_action( 'wp_head', 'wp_robots', 1 );
</span></span></pre></div>
<a id="trunksrcwpincludesdeprecatedphp"></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/deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/deprecated.php 2023-04-04 10:04:45 UTC (rev 55619)
+++ trunk/src/wp-includes/deprecated.php 2023-04-04 14:54:31 UTC (rev 55620)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4627,3 +4627,15 @@
</span><span class="cx" style="display: block; padding: 0 10px"> 'postId' => $template->id,
</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">+
+/**
+ * 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' );
+}
</ins></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-04-04 10:04:45 UTC (rev 55619)
+++ trunk/src/wp-includes/general-template.php 2023-04-04 14:54:31 UTC (rev 55620)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3373,19 +3373,6 @@
</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">- * 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' )
- );
-}
-
-/**
</del><span class="cx" style="display: block; padding: 0 10px"> * Displays a referrer `strict-origin-when-cross-origin` meta tag.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Outputs a referrer `strict-origin-when-cross-origin` meta tag that tells the browser not to send
</span></span></pre></div>
<a id="trunksrcwpincludeshttpsdetectionphp"></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/https-detection.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/https-detection.php 2023-04-04 10:04:45 UTC (rev 55619)
+++ trunk/src/wp-includes/https-detection.php 2023-04-04 14:54:31 UTC (rev 55620)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -208,14 +208,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> return false !== strpos( $html, $pattern );
</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">- // 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.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ // 2. Check if HTML includes the site's REST API link.
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( has_action( 'wp_head', 'rest_output_link_wp_head' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> // Try both HTTPS and HTTP since the URL depends on context.
</span><span class="cx" style="display: block; padding: 0 10px"> $pattern = preg_replace( '#^https?:(?=//)#', '', esc_url( get_rest_url() ) ); // See rest_output_link_wp_head().
</span></span></pre></div>
<a id="trunksrcwpincludeswlwmanifestxml"></a>
<div class="delfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Deleted: trunk/src/wp-includes/wlwmanifest.xml</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/wlwmanifest.xml 2023-04-04 10:04:45 UTC (rev 55619)
+++ trunk/src/wp-includes/wlwmanifest.xml 2023-04-04 14:54:31 UTC (rev 55620)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1,43 +0,0 @@
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?xml version="1.0" encoding="utf-8" ?>
-
-<manifest xmlns="http://schemas.microsoft.com/wlw/manifest/weblog">
-
- <options>
- <clientType>WordPress</clientType>
- <supportsKeywords>Yes</supportsKeywords>
- <supportsGetTags>Yes</supportsGetTags>
- </options>
-
- <weblog>
- <serviceName>WordPress</serviceName>
- <imageUrl>images/wlw/wp-icon.png</imageUrl>
- <watermarkImageUrl>images/wlw/wp-watermark.png</watermarkImageUrl>
- <homepageLinkText>View site</homepageLinkText>
- <adminLinkText>Dashboard</adminLinkText>
- <adminUrl>
- <![CDATA[
- {blog-postapi-url}/../wp-admin/
- ]]>
- </adminUrl>
- <postEditingUrl>
- <![CDATA[
- {blog-postapi-url}/../wp-admin/post.php?action=edit&post={post-id}
- ]]>
- </postEditingUrl>
- </weblog>
-
- <buttons>
- <button>
- <id>0</id>
- <text>Manage Comments</text>
- <imageUrl>images/wlw/wp-comments.png</imageUrl>
- <clickUrl>
- <![CDATA[
- {blog-postapi-url}/../wp-admin/edit-comments.php
- ]]>
- </clickUrl>
- </button>
-
- </buttons>
-
-</manifest>
</del></span></pre></div>
<a id="trunktestsphpunittestshttpsdetectionphp"></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/https-detection.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/tests/phpunit/tests/https-detection.php 2023-04-04 10:04:45 UTC (rev 55619)
+++ trunk/tests/phpunit/tests/https-detection.php 2023-04-04 14:54:31 UTC (rev 55620)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -199,36 +199,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * @ticket 47577
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- 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
- */
</del><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_is_local_html_output_via_rest_link() {
</span><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'wp_head', 'rsd_link' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_action( 'wp_head', 'wlwmanifest_link' );
</del><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // HTML includes REST API link.
</span><span class="cx" style="display: block; padding: 0 10px"> $head_tag = get_echo( 'rest_output_link_wp_head' );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -256,7 +228,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function test_wp_is_local_html_output_cannot_determine() {
</span><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'wp_head', 'rsd_link' );
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- remove_action( 'wp_head', 'wlwmanifest_link' );
</del><span class="cx" style="display: block; padding: 0 10px"> remove_action( 'wp_head', 'rest_output_link_wp_head' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> // The HTML here doesn't matter because all hooks are removed.
</span></span></pre>
</div>
</div>
</body>
</html>