<!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>[30538] trunk/src: Ensure inline code is markdown-escaped as such, HTML tags are removed from summaries, and that code snippets in descriptions are properly indented.</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 { 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/30538">30538</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/30538","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>DrewAPicture</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2014-11-24 05:18:56 +0000 (Mon, 24 Nov 2014)</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'>Ensure inline code is markdown-escaped as such, HTML tags are removed from summaries, and that code snippets in descriptions are properly indented.
Affects DocBlocks for the following core elements:
* Remove HTML tag from parameter description in `comment_form()`
* Remove HTML tag from a summary for the `comment_form_top` hook
* Markdown-indent a code snippet in the description for `get_linkobjectsbyname()`
* Markdown-indent a code snippet and format an unordered list in the description for `get_linkobjects()`
* Backtick-escape some inline code in the description for `clean_pre()`
* Remove HTML tag from the summary for the `rss_tag_pre` hook
* Various formatting fixes in the descriptions for `get_filesystem_method()` and `request_filesystem_credentials()`
Props rarst for the initial patch.
See <a href="https://core.trac.wordpress.org/ticket/30473">#30473</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminincludesfilephp">trunk/src/wp-admin/includes/file.php</a></li>
<li><a href="#trunksrcwpincludescommenttemplatephp">trunk/src/wp-includes/comment-template.php</a></li>
<li><a href="#trunksrcwpincludesdeprecatedphp">trunk/src/wp-includes/deprecated.php</a></li>
<li><a href="#trunksrcwpincludesfeedrss2php">trunk/src/wp-includes/feed-rss2.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminincludesfilephp"></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/file.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/file.php 2014-11-24 04:57:17 UTC (rev 30537)
+++ trunk/src/wp-admin/includes/file.php 2014-11-24 05:18:56 UTC (rev 30538)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -868,16 +868,24 @@
</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"> * Determines which Filesystem Method to use.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * The priority of the Transports are: Direct, SSH2, FTP PHP Extension, FTP Sockets (Via Sockets class, or fsockopen())
</del><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * The priority of the Transports are: Direct, SSH2, FTP PHP Extension,
+ * FTP Sockets (Via Sockets class, or `fsockopen()`).
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * Note that the return value of this function can be overridden in 2 ways
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * - By defining FS_METHOD in your <code>wp-config.php</code> file
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
+ * - By defining FS_METHOD in your `wp-config.php` file
</ins><span class="cx" style="display: block; padding: 0 10px"> * - By using the filesystem_method filter
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Valid values for these are: 'direct', 'ssh2', 'ftpext' or 'ftpsockets'
- * Plugins may also define a custom transport handler, See the WP_Filesystem function for more information.
</del><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Valid values for these are: 'direct', 'ssh2', 'ftpext' or 'ftpsockets'.
+ *
+ * Plugins may also define a custom transport handler, See the WP_Filesystem
+ * function for more information.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @since 2.5.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @todo Properly mark arguments as optional.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param array $args Connection details.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $context Full path to the directory that is tested for being writable.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param bool $allow_relaxed_file_ownership Whether to allow Group/World writable.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -943,15 +951,21 @@
</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 a form to the user to request for their FTP/SSH details in order to connect to the filesystem.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Displays a form to the user to request for their FTP/SSH details in order
+ * to connect to the filesystem.
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * All chosen/entered details are saved, Excluding the Password.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Hostnames may be in the form of hostname:portnumber (eg: wordpress.org:2467) to specify an alternate FTP/SSH port.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Hostnames may be in the form of hostname:portnumber (eg: wordpress.org:2467)
+ * to specify an alternate FTP/SSH port.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Plugins may override this form by returning true|false via the <code>request_filesystem_credentials</code> filter.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Plugins may override this form by returning true|false via the
+ * {@see 'request_filesystem_credentials'} filter.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 2.5.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 2.5.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @todo Properly mark optional arguments as such
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $form_post the URL to post the form to
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $type the chosen Filesystem method in use
</span><span class="cx" style="display: block; padding: 0 10px"> * @param boolean $error if the current request has failed to connect
</span></span></pre></div>
<a id="trunksrcwpincludescommenttemplatephp"></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/comment-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/comment-template.php 2014-11-24 04:57:17 UTC (rev 30537)
+++ trunk/src/wp-includes/comment-template.php 2014-11-24 05:18:56 UTC (rev 30538)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2137,7 +2137,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * }
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $comment_field The comment textarea field HTML.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $must_log_in HTML element for a 'must be logged in to comment' message.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @type string $logged_in_as HTML element for a 'logged in as <user>' message.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @type string $logged_in_as HTML element for a 'logged in as [user]' message.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @type string $comment_notes_before HTML element for a message displayed before the comment form.
</span><span class="cx" style="display: block; padding: 0 10px"> * Default 'Your email address will not be published.'.
</span><span class="cx" style="display: block; padding: 0 10px"> * @type string $comment_notes_after HTML element for a message displayed after the comment form.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2246,7 +2246,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <form action="<?php echo site_url( '/wp-comments-post.php' ); ?>" method="post" id="<?php echo esc_attr( $args['id_form'] ); ?>" class="comment-form"<?php echo $html5 ? ' novalidate' : ''; ?>>
</span><span class="cx" style="display: block; padding: 0 10px"> <?php
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Fires at the top of the comment form, inside the <form> tag.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fires at the top of the comment form, inside the form tag.
</ins><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 class="cx" style="display: block; padding: 0 10px"> */
</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 2014-11-24 04:57:17 UTC (rev 30537)
+++ trunk/src/wp-includes/deprecated.php 2014-11-24 05:18:56 UTC (rev 30538)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -451,12 +451,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Gets an array of link objects associated with category $cat_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">- * <code>
- * $links = get_linkobjectsbyname('fred');
- * foreach ($links as $link) {
- * echo '<li>'.$link->link_name.'</li>';
- * }
- * </code>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * $links = get_linkobjectsbyname( 'fred' );
+ * foreach ( $links as $link ) {
+ * echo '<li>' . $link->link_name . '</li>';
+ * }
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.0.1
</span><span class="cx" style="display: block; padding: 0 10px"> * @deprecated 2.1.0
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -485,32 +483,30 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Gets an array of link objects associated with category n.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Usage:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * <code>
- * $links = get_linkobjects(1);
- * if ($links) {
- * foreach ($links as $link) {
- * echo '<li>'.$link->link_name.'<br />'.$link->link_description.'</li>';
- * }
- * }
- * </code>
</del><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * $links = get_linkobjects(1);
+ * if ($links) {
+ * foreach ($links as $link) {
+ * echo '<li>'.$link->link_name.'<br />'.$link->link_description.'</li>';
+ * }
+ * }
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * Fields are:
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * <ol>
- * <li>link_id</li>
- * <li>link_url</li>
- * <li>link_name</li>
- * <li>link_image</li>
- * <li>link_target</li>
- * <li>link_category</li>
- * <li>link_description</li>
- * <li>link_visible</li>
- * <li>link_owner</li>
- * <li>link_rating</li>
- * <li>link_updated</li>
- * <li>link_rel</li>
- * <li>link_notes</li>
- * </ol>
</del><span class="cx" style="display: block; padding: 0 10px"> *
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * - link_id
+ * - link_url
+ * - link_name
+ * - link_image
+ * - link_target
+ * - link_category
+ * - link_description
+ * - link_visible
+ * - link_owner
+ * - link_rating
+ * - link_updated
+ * - link_rel
+ * - link_notes
+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @since 1.0.1
</span><span class="cx" style="display: block; padding: 0 10px"> * @deprecated 2.1.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @deprecated Use get_bookmarks()
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2989,7 +2985,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /**
</span><span class="cx" style="display: block; padding: 0 10px"> * Accepts matches array from preg_replace_callback in wpautop() or a string.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * Ensures that the contents of a <<pre>>...<</pre>> HTML block are not
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Ensures that the contents of a `<pre>...</pre>` HTML block are not
</ins><span class="cx" style="display: block; padding: 0 10px"> * converted into paragraphs or line-breaks.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.2.0
</span></span></pre></div>
<a id="trunksrcwpincludesfeedrss2php"></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/feed-rss2.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/feed-rss2.php 2014-11-24 04:57:17 UTC (rev 30537)
+++ trunk/src/wp-includes/feed-rss2.php 2014-11-24 05:18:56 UTC (rev 30538)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -11,7 +11,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> echo '<?xml version="1.0" encoding="'.get_option('blog_charset').'"?'.'>';
</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">- * Fires between the <xml> and <rss> tags in a feed.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Fires between the xml and rss tags in a feed.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.0.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span></span></pre>
</div>
</div>
</body>
</html>