<!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>[38125] trunk/src/wp-includes: Docs: Fix formatting, tense, verb conjugation, and other syntax for wp-includes/* elements introduced or changed in 4.6.</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/38125">38125</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/38125","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>2016-07-20 19:32:05 +0000 (Wed, 20 Jul 2016)</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'>Docs: Fix formatting, tense, verb conjugation, and other syntax for wp-includes/* elements introduced or changed in 4.6.
Part 2/2.
Fixes <a href="https://core.trac.wordpress.org/ticket/37318">#37318</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpincludeslinktemplatephp">trunk/src/wp-includes/link-template.php</a></li>
<li><a href="#trunksrcwpincludesmetaphp">trunk/src/wp-includes/meta.php</a></li>
<li><a href="#trunksrcwpincludesmsblogsphp">trunk/src/wp-includes/ms-blogs.php</a></li>
<li><a href="#trunksrcwpincludesmsloadphp">trunk/src/wp-includes/ms-load.php</a></li>
<li><a href="#trunksrcwpincludespluginphp">trunk/src/wp-includes/plugin.php</a></li>
<li><a href="#trunksrcwpincludespostphp">trunk/src/wp-includes/post.php</a></li>
<li><a href="#trunksrcwpincludesqueryphp">trunk/src/wp-includes/query.php</a></li>
<li><a href="#trunksrcwpincludesscriptloaderphp">trunk/src/wp-includes/script-loader.php</a></li>
<li><a href="#trunksrcwpincludestaxonomyphp">trunk/src/wp-includes/taxonomy.php</a></li>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
<li><a href="#trunksrcwpincludeswpdbphp">trunk/src/wp-includes/wp-db.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpincludeslinktemplatephp"></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/link-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/link-template.php 2016-07-20 18:42:54 UTC (rev 38124)
+++ trunk/src/wp-includes/link-template.php 2016-07-20 19:32:05 UTC (rev 38125)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3597,7 +3597,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Outputs rel=canonical for singular queries.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.9.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 4.6.0 Adjusted to use `wp_get_canonical_url()`.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.6.0 Adjusted to use wp_get_canonical_url().
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function rel_canonical() {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_singular() ) {
</span></span></pre></div>
<a id="trunksrcwpincludesmetaphp"></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/meta.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/meta.php 2016-07-20 18:42:54 UTC (rev 38124)
+++ trunk/src/wp-includes/meta.php 2016-07-20 19:32:05 UTC (rev 38125)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1095,9 +1095,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $object_type The type of object.
- * @param string $meta_key The meta key.
- *
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $object_type The type of object.
+ * @param string $meta_key The meta key.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool True if successful. False if the meta key was not registered.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function unregister_meta_key( $object_type, $meta_key ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1133,7 +1132,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $object_type The type of object. Post, comment, user, term.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @return array List of registered meta keys.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_registered_meta_keys( $object_type ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1155,7 +1153,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $object_id ID of the object the metadata is for.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $meta_key Optional. Registered metadata key. If not specified, retrieve all registered
</span><span class="cx" style="display: block; padding: 0 10px"> * metadata for the specified object.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @return mixed A single value or array of values for a key if specified. An array of all registered keys
</span><span class="cx" style="display: block; padding: 0 10px"> * and values for an object ID if not.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span></span></pre></div>
<a id="trunksrcwpincludesmsblogsphp"></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/ms-blogs.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-blogs.php 2016-07-20 18:42:54 UTC (rev 38124)
+++ trunk/src/wp-includes/ms-blogs.php 2016-07-20 19:32:05 UTC (rev 38125)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -461,8 +461,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $id Blog ID.
- * @param WP_Site $blog
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $id Blog ID.
+ * @param WP_Site $blog Site object.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @param string $domain_path_key md5 hash of domain and path.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> do_action( 'clean_site_cache', $blog_id, $blog, $domain_path_key );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -520,7 +520,6 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see update_site_cache()
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- *
</del><span class="cx" style="display: block; padding: 0 10px"> * @global wpdb $wpdb WordPress database abstraction object.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $ids ID list.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1089,7 +1088,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Network $current_site
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param WP_Network|int|null $network Network to retrieve.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param WP_Network|int|null $network Network to retrieve, passed by reference.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Network|null The network object or null if not found.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function get_network( &$network = null ) {
</span></span></pre></div>
<a id="trunksrcwpincludesmsloadphp"></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/ms-load.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/ms-load.php 2016-07-20 18:42:54 UTC (rev 38124)
+++ trunk/src/wp-includes/ms-load.php 2016-07-20 19:32:05 UTC (rev 38125)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -137,7 +137,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 3.9.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.0 Converted to leverage WP_Network
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 4.6.0 Converted to use `get_network()`
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.6.0 Converted to use get_network()
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param object|int $network The network's database row or ID.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return WP_Network|false Object containing network information if found, false if not.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -283,7 +283,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $domain The requested domain.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $path The requested path.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param bool $subdomain Whether a subdomain (true) or subdirectory (false) configuration.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param bool $subdomain Optional. Whether a subdomain (true) or subdirectory (false) configuration.
+ * Default false.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return bool|string True if bootstrap successfully populated `$current_blog` and `$current_site`.
</span><span class="cx" style="display: block; padding: 0 10px"> * False if bootstrap could not be properly completed.
</span><span class="cx" style="display: block; padding: 0 10px"> * Redirect URL if parts exist, but the request as a whole can not be fulfilled.
</span></span></pre></div>
<a id="trunksrcwpincludespluginphp"></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/plugin.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/plugin.php 2016-07-20 18:42:54 UTC (rev 38124)
+++ trunk/src/wp-includes/plugin.php 2016-07-20 19:32:05 UTC (rev 38125)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -669,8 +669,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $tag The name of the filter hook.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $args Array of additional function arguments to be passed to apply_filters().
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string $version The version of WordPress that deprecated the hook.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $replacement Optional. The hook that should have been used.
- * @param string $message Optional. A message regarding the change.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $replacement Optional. The hook that should have been used. Default false.
+ * @param string $message Optional. A message regarding the change. Default null.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function apply_filters_deprecated( $tag, $args, $version, $replacement = false, $message = null ) {
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! has_filter( $tag ) ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1003,7 +1003,7 @@
</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">- * Back up global variables used for actions and filters.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Backs up global variables used for actions and filters.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Prevents redefinition of these globals in advanced-cache.php from accidentally
</span><span class="cx" style="display: block; padding: 0 10px"> * destroying existing data.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1016,11 +1016,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $merged_filters Merges the filter hooks using this function.
</span><span class="cx" style="display: block; padding: 0 10px"> * @global array $wp_current_filter Stores the list of current filters with the current one last.
</span><span class="cx" style="display: block; padding: 0 10px"> * @staticvar array $backup_globals Backed up globals.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array the staticvar from the first time it is set.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _backup_plugin_globals(){
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_filter, $wp_actions, $merged_filters, $wp_current_filter;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> static $backup_globals = array();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( empty( $backup_globals ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $backup_globals = array(
</span><span class="cx" style="display: block; padding: 0 10px"> 'backup_wp_filter' => $wp_filter,
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1033,7 +1036,7 @@
</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">- * Safely restore backed up global variables used for actions and filters.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Safely restores backed up global variables used for actions and filters.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> * @access private
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1046,7 +1049,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function _restore_plugin_globals(){
</span><span class="cx" style="display: block; padding: 0 10px"> global $wp_filter, $wp_actions, $merged_filters, $wp_current_filter;
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> $backup_globals = _backup_plugin_globals();
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $wp_filter !== $backup_globals['backup_wp_filter'] ){
</span><span class="cx" style="display: block; padding: 0 10px"> $wp_filter = array_merge_recursive( $wp_filter, $backup_globals['backup_wp_filter'] );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span></span></pre></div>
<a id="trunksrcwpincludespostphp"></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/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/post.php 2016-07-20 18:42:54 UTC (rev 38124)
+++ trunk/src/wp-includes/post.php 2016-07-20 19:32:05 UTC (rev 38125)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4316,7 +4316,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Sub pages will be in the "directory" under the parent page post name.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 1.5.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 4.6.0 The $page parameter is optional.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.6.0 Converted the `$page` parameter to optional.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param WP_Post|object|int $page Optional. Page ID or WP_Post object. Default is global $post.
</span><span class="cx" style="display: block; padding: 0 10px"> * @return string|false Page URI, false on error.
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4955,7 +4955,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param int $post_id Optional. Attachment ID. Default 0.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param int $post_id Optional. Attachment ID. Default is the ID of the global `$post`.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return string|false False on failure. Attachment caption on success.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_get_attachment_caption( $post_id = 0 ) {
</span></span></pre></div>
<a id="trunksrcwpincludesqueryphp"></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/query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/query.php 2016-07-20 18:42:54 UTC (rev 38124)
+++ trunk/src/wp-includes/query.php 2016-07-20 19:32:05 UTC (rev 38125)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1473,7 +1473,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.5.0 Removed the `$comments_popup` parameter.
</span><span class="cx" style="display: block; padding: 0 10px"> * Introduced the `$comment_status` and `$ping_status` parameters.
</span><span class="cx" style="display: block; padding: 0 10px"> * Introduced `RAND(x)` syntax for `$orderby`, which allows an integer seed value to random sorts.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 4.6.0 Added 'post_name__in' support for `$orderby`. Introduced `$lazy_load_term_meta`.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.6.0 Added 'post_name__in' support for `$orderby`. Introduced the `$lazy_load_term_meta` argument.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @access public
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param string|array $query {
</span></span></pre></div>
<a id="trunksrcwpincludesscriptloaderphp"></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/script-loader.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/script-loader.php 2016-07-20 18:42:54 UTC (rev 38124)
+++ trunk/src/wp-includes/script-loader.php 2016-07-20 19:32:05 UTC (rev 38125)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -918,6 +918,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @link http://api.jqueryui.com/datepicker/#options
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ *
</ins><span class="cx" style="display: block; padding: 0 10px"> * @global WP_Locale $wp_locale The WordPress date and time locale object.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_localize_jquery_ui_datepicker() {
</span></span></pre></div>
<a id="trunksrcwpincludestaxonomyphp"></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/taxonomy.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/taxonomy.php 2016-07-20 18:42:54 UTC (rev 38124)
+++ trunk/src/wp-includes/taxonomy.php 2016-07-20 19:32:05 UTC (rev 38125)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1225,7 +1225,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Filters the found terms.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.3.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 4.6.0 Added `$term_query`.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.6.0 Added the `$term_query` parameter.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $terms Array of found terms.
</span><span class="cx" style="display: block; padding: 0 10px"> * @param array $taxonomies An array of taxonomies.
</span></span></pre></div>
<a id="trunksrcwpincludesuserphp"></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/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/user.php 2016-07-20 18:42:54 UTC (rev 38124)
+++ trunk/src/wp-includes/user.php 2016-07-20 19:32:05 UTC (rev 38125)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2333,16 +2333,18 @@
</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">- * Initiate email notifications related to the creation of new users.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Initiates email notifications related to the creation of new users.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * Notifications are sent both to the site admin and to the newly created user.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.4.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 4.6.0 The `$notify` parameter accepts 'user' for sending notification only to the user created.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.6.0 Converted the `$notify` parameter to accept 'user' for sending
+ * notifications only to the user created.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @param int $user_id ID of the newly created user.
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $notify Optional. Type of notification that should happen. Accepts 'admin' or an empty string
- * (admin only), 'user', or 'both' (admin and user). Default 'both'.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $notify Optional. Type of notification that should happen. Accepts 'admin'
+ * or an empty string (admin only), 'user', or 'both' (admin and user).
+ * Default 'both'.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> function wp_send_new_user_notifications( $user_id, $notify = 'both' ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_new_user_notification( $user_id, null, $notify );
</span></span></pre></div>
<a id="trunksrcwpincludeswpdbphp"></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/wp-db.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/wp-db.php 2016-07-20 18:42:54 UTC (rev 38124)
+++ trunk/src/wp-includes/wp-db.php 2016-07-20 19:32:05 UTC (rev 38125)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -756,15 +756,15 @@
</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">- * Given a charset and collation, determine the best charset and collation to use.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * Determines the best charset and collation to use given a charset and collation.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * For example, when able, utf8mb4 should be used instead of utf8.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 4.6.0
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @access public
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @param string $charset The character set to check.
- * @param string $collate The collation to check.
- *
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @param string $charset The character set to check.
+ * @param string $collate The collation to check.
</ins><span class="cx" style="display: block; padding: 0 10px"> * @return array The most appropriate character set and collation to use.
</span><span class="cx" style="display: block; padding: 0 10px"> */
</span><span class="cx" style="display: block; padding: 0 10px"> public function determine_charset( $charset, $collate ) {
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3236,8 +3236,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * Determine if a database supports a particular feature.
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @since 2.7.0
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- * @since 4.1.0 Support was added for the 'utf8mb4' feature.
- * @since 4.6.0 Support was added for the 'utf8mb4_520' feature.
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @since 4.1.0 Added support for the 'utf8mb4' feature.
+ * @since 4.6.0 Added support for the 'utf8mb4_520' feature.
</ins><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="cx" style="display: block; padding: 0 10px"> * @see wpdb::db_version()
</span><span class="cx" style="display: block; padding: 0 10px"> *
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3276,7 +3276,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> return version_compare( $client_version, '5.5.3', '>=' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- case 'utf8mb4_520' : // @since 4.6.0
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ case 'utf8mb4_520' : // @since 4.6.0
</ins><span class="cx" style="display: block; padding: 0 10px"> return version_compare( $version, '5.6', '>=' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>