<!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>[18827] trunk/wp-includes: phpdoc typo and readability fixes.</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, #logmsg > ol { margin-left: 0; 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">
<dt>Revision</dt> <dd><a href="http://core.trac.wordpress.org/changeset/18827">18827</a></dd>
<dt>Author</dt> <dd>ryan</dd>
<dt>Date</dt> <dd>2011-09-29 22:57:43 +0000 (Thu, 29 Sep 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>phpdoc typo and readability fixes. Props SergeyBiryukov. fixes <a href="http://core.trac.wordpress.org/ticket/18560">#18560</a></pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpincludesdeprecatedphp">trunk/wp-includes/deprecated.php</a></li>
<li><a href="#trunkwpincludesksesphp">trunk/wp-includes/kses.php</a></li>
<li><a href="#trunkwpincludesl10nphp">trunk/wp-includes/l10n.php</a></li>
<li><a href="#trunkwpincludeslinktemplatephp">trunk/wp-includes/link-template.php</a></li>
<li><a href="#trunkwpincludesloadphp">trunk/wp-includes/load.php</a></li>
<li><a href="#trunkwpincludeslocalephp">trunk/wp-includes/locale.php</a></li>
<li><a href="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
<li><a href="#trunkwpincludespomotranslationsphp">trunk/wp-includes/pomo/translations.php</a></li>
<li><a href="#trunkwpincludespostthumbnailtemplatephp">trunk/wp-includes/post-thumbnail-template.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/deprecated.php (18826 => 18827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/deprecated.php 2011-09-29 22:33:51 UTC (rev 18826)
+++ trunk/wp-includes/deprecated.php 2011-09-29 22:57:43 UTC (rev 18827)
</span><span class="lines">@@ -2731,9 +2731,9 @@
</span><span class="cx"> * @deprecated 3.3
</span><span class="cx"> *
</span><span class="cx"> * @param string $title Optional. Link title format.
</span><del>- * @param bool $in_same_cat Optional. Whether link should be in same category.
</del><ins>+ * @param bool $in_same_cat Optional. Whether link should be in a same category.
</ins><span class="cx"> * @param string $excluded_categories Optional. Excluded categories IDs.
</span><del>- * @param bool $start Optional, default is true. Whether display link to first or last post.
</del><ins>+ * @param bool $start Optional, default is true. Whether to display link to first or last post.
</ins><span class="cx"> * @return string
</span><span class="cx"> */
</span><span class="cx"> function get_boundary_post_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '', $start = true) {
</span><span class="lines">@@ -2771,7 +2771,7 @@
</span><span class="cx"> * @deprecated 3.3
</span><span class="cx"> *
</span><span class="cx"> * @param string $title Optional. Link title format.
</span><del>- * @param bool $in_same_cat Optional. Whether link should be in same category.
</del><ins>+ * @param bool $in_same_cat Optional. Whether link should be in a same category.
</ins><span class="cx"> * @param string $excluded_categories Optional. Excluded categories IDs.
</span><span class="cx"> */
</span><span class="cx"> function start_post_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '') {
</span></span></pre></div>
<a id="trunkwpincludesksesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/kses.php (18826 => 18827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/kses.php 2011-09-29 22:33:51 UTC (rev 18826)
+++ trunk/wp-includes/kses.php 2011-09-29 22:57:43 UTC (rev 18827)
</span><span class="lines">@@ -842,7 +842,7 @@
</span><span class="cx"> * Performs different checks for attribute values.
</span><span class="cx"> *
</span><span class="cx"> * The currently implemented checks are "maxlen", "minlen", "maxval", "minval"
</span><del>- * and "valueless" with even more checks to come soon.
</del><ins>+ * and "valueless".
</ins><span class="cx"> *
</span><span class="cx"> * @since 1.0.0
</span><span class="cx"> *
</span><span class="lines">@@ -887,7 +887,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'minval' :
</span><del>- # The minval check checks that the attribute value is a positive integer,
</del><ins>+ # The minval check makes sure that the attribute value is a positive integer,
</ins><span class="cx"> # and that it is not smaller than the given value.
</span><span class="cx">
</span><span class="cx"> if (!preg_match('/^\s{0,6}[0-9]{1,6}\s{0,6}$/', $value))
</span><span class="lines">@@ -897,7 +897,7 @@
</span><span class="cx"> break;
</span><span class="cx">
</span><span class="cx"> case 'valueless' :
</span><del>- # The valueless check checks if the attribute has a value
</del><ins>+ # The valueless check makes sure if the attribute has a value
</ins><span class="cx"> # (like <a href="blah">) or not (<option selected>). If the given value
</span><span class="cx"> # is a "y" or a "Y", the attribute must not have a value.
</span><span class="cx"> # If the given value is an "n" or an "N", the attribute must have one.
</span><span class="lines">@@ -954,14 +954,14 @@
</span><span class="cx"> /**
</span><span class="cx"> * Strips slashes from in front of quotes.
</span><span class="cx"> *
</span><del>- * This function changes the character sequence \" to just ". It leaves all
</del><ins>+ * This function changes the character sequence \" to just ". It leaves all
</ins><span class="cx"> * other slashes alone. It's really weird, but the quoting from
</span><span class="cx"> * preg_replace(//e) seems to require this.
</span><span class="cx"> *
</span><span class="cx"> * @since 1.0.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $string String to strip slashes
</span><del>- * @return string Fixed strings with quoted slashes
</del><ins>+ * @return string Fixed string with quoted slashes
</ins><span class="cx"> */
</span><span class="cx"> function wp_kses_stripslashes($string) {
</span><span class="cx"> return preg_replace('%\\\\"%', '"', $string);
</span><span class="lines">@@ -1042,7 +1042,7 @@
</span><span class="cx"> * Callback for wp_kses_bad_protocol_once() regular expression.
</span><span class="cx"> *
</span><span class="cx"> * This function processes URL protocols, checks to see if they're in the
</span><del>- * white-list or not, and returns different data depending on the answer.
</del><ins>+ * whitelist or not, and returns different data depending on the answer.
</ins><span class="cx"> *
</span><span class="cx"> * @access private
</span><span class="cx"> * @since 1.0.0
</span><span class="lines">@@ -1119,7 +1119,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Callback for wp_kses_normalize_entities() regular expression.
</span><span class="cx"> *
</span><del>- * This function helps wp_kses_normalize_entities() to only accept 16 bit values
</del><ins>+ * This function helps wp_kses_normalize_entities() to only accept 16-bit values
</ins><span class="cx"> * and nothing more for &#number; entities.
</span><span class="cx"> *
</span><span class="cx"> * @access private
</span><span class="lines">@@ -1166,7 +1166,7 @@
</span><span class="cx"> * Helper function to determine if a Unicode value is valid.
</span><span class="cx"> *
</span><span class="cx"> * @param int $i Unicode value
</span><del>- * @return bool true if the value was a valid Unicode number
</del><ins>+ * @return bool True if the value was a valid Unicode number
</ins><span class="cx"> */
</span><span class="cx"> function valid_unicode($i) {
</span><span class="cx"> return ( $i == 0x9 || $i == 0xa || $i == 0xd ||
</span><span class="lines">@@ -1342,7 +1342,7 @@
</span><span class="cx"> * will be added.
</span><span class="cx"> *
</span><span class="cx"> * First removes all of the Kses filters in case the current user does not need
</span><del>- * to have Kses filter the content. If the user does not have unfiltered html
</del><ins>+ * to have Kses filter the content. If the user does not have unfiltered_html
</ins><span class="cx"> * capability, then Kses filters are added.
</span><span class="cx"> *
</span><span class="cx"> * @uses kses_remove_filters() Removes the Kses filters
</span></span></pre></div>
<a id="trunkwpincludesl10nphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/l10n.php (18826 => 18827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/l10n.php 2011-09-29 22:33:51 UTC (rev 18826)
+++ trunk/wp-includes/l10n.php 2011-09-29 22:57:43 UTC (rev 18827)
</span><span class="lines">@@ -16,7 +16,7 @@
</span><span class="cx"> * defined. Then it is filtered through the 'locale' filter hook and the value
</span><span class="cx"> * for the locale global set and the locale is returned.
</span><span class="cx"> *
</span><del>- * The process to get the locale should only be done once but the locale will
</del><ins>+ * The process to get the locale should only be done once, but the locale will
</ins><span class="cx"> * always be filtered using the 'locale' hook.
</span><span class="cx"> *
</span><span class="cx"> * @since 1.5.0
</span><span class="lines">@@ -53,7 +53,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Retrieves the translation of $text. If there is no translation, or
</span><del>- * the domain isn't loaded the original text is returned.
</del><ins>+ * the domain isn't loaded, the original text is returned.
</ins><span class="cx"> *
</span><span class="cx"> * @see __() Don't use translate() directly, use __()
</span><span class="cx"> * @since 2.2.0
</span><span class="lines">@@ -84,7 +84,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Retrieves the translation of $text. If there is no translation, or
</span><del>- * the domain isn't loaded the original text is returned.
</del><ins>+ * the domain isn't loaded, the original text is returned.
</ins><span class="cx"> *
</span><span class="cx"> * @see translate() An alias of translate()
</span><span class="cx"> * @since 2.1.0
</span><span class="lines">@@ -99,7 +99,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Retrieves the translation of $text and escapes it for safe use in an attribute.
</span><del>- * If there is no translation, or the domain isn't loaded the original text is returned.
</del><ins>+ * If there is no translation, or the domain isn't loaded, the original text is returned.
</ins><span class="cx"> *
</span><span class="cx"> * @see translate() An alias of translate()
</span><span class="cx"> * @see esc_attr()
</span><span class="lines">@@ -115,7 +115,7 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Retrieves the translation of $text and escapes it for safe use in HTML output.
</span><del>- * If there is no translation, or the domain isn't loaded the original text is returned.
</del><ins>+ * If there is no translation, or the domain isn't loaded, the original text is returned.
</ins><span class="cx"> *
</span><span class="cx"> * @see translate() An alias of translate()
</span><span class="cx"> * @see esc_html()
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> * found in more than two places but with different translated context.
</span><span class="cx"> *
</span><span class="cx"> * By including the context in the pot file translators can translate the two
</span><del>- * string differently.
</del><ins>+ * strings differently.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.8.0
</span><span class="cx"> *
</span><span class="lines">@@ -257,7 +257,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Register plural strings in POT file, but don't translate them.
</span><span class="cx"> *
</span><del>- * Used when you want do keep structures with translatable plural strings and
</del><ins>+ * Used when you want to keep structures with translatable plural strings and
</ins><span class="cx"> * use them later.
</span><span class="cx"> *
</span><span class="cx"> * Example:
</span><span class="lines">@@ -291,8 +291,8 @@
</span><span class="cx"> * Translate the result of _n_noop() or _nx_noop()
</span><span class="cx"> *
</span><span class="cx"> * @since 3.1
</span><del>- * @param array $nooped_plural array with singular, plural and context keys, usually the result of _n_noop() or _nx_noop()
- * @param int $count number of objects
</del><ins>+ * @param array $nooped_plural Array with singular, plural and context keys, usually the result of _n_noop() or _nx_noop()
+ * @param int $count Number of objects
</ins><span class="cx"> * @param string $domain Optional. The domain identifier the text should be retrieved in
</span><span class="cx"> */
</span><span class="cx"> function translate_nooped_plural( $nooped_plural, $count, $domain = 'default' ) {
</span><span class="lines">@@ -316,7 +316,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $domain Unique identifier for retrieving translated strings
</span><span class="cx"> * @param string $mofile Path to the .mo file
</span><del>- * @return bool true on success, false on failure
</del><ins>+ * @return bool True on success, false on failure
</ins><span class="cx"> */
</span><span class="cx"> function load_textdomain( $domain, $mofile ) {
</span><span class="cx"> global $l10n;
</span><span class="lines">@@ -373,7 +373,7 @@
</span><span class="cx"> * Loads default translated strings based on locale.
</span><span class="cx"> *
</span><span class="cx"> * Loads the .mo file in WP_LANG_DIR constant path from WordPress root. The
</span><del>- * translated (.mo) file is named based off of the locale.
</del><ins>+ * translated (.mo) file is named based on the locale.
</ins><span class="cx"> *
</span><span class="cx"> * @since 1.5.0
</span><span class="cx"> */
</span><span class="lines">@@ -422,8 +422,8 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $domain Unique identifier for retrieving translated strings
</span><del>- * @param strings $mu_plugin_rel_path Relative to WPMU_PLUGIN_DIR directory in which
- * the MO file resides. Defaults is empty string.
</del><ins>+ * @param string $mu_plugin_rel_path Relative to WPMU_PLUGIN_DIR directory in which
+ * the MO file resides. Defaults to empty string.
</ins><span class="cx"> */
</span><span class="cx"> function load_muplugin_textdomain( $domain, $mu_plugin_rel_path = '' ) {
</span><span class="cx"> $locale = apply_filters( 'plugin_locale', get_locale(), $domain );
</span><span class="lines">@@ -520,7 +520,7 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $dir A directory in which to search for language files. The default directory is WP_LANG_DIR.
</span><del>- * @return array Array of language codes or an empty array if no languages are present. Language codes are formed by stripping the .mo extension from the language file names.
</del><ins>+ * @return array Array of language codes or an empty array if no languages are present. Language codes are formed by stripping the .mo extension from the language file names.
</ins><span class="cx"> */
</span><span class="cx"> function get_available_languages( $dir = null ) {
</span><span class="cx"> $languages = array();
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (18826 => 18827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2011-09-29 22:33:51 UTC (rev 18826)
+++ trunk/wp-includes/link-template.php 2011-09-29 22:57:43 UTC (rev 18827)
</span><span class="lines">@@ -560,7 +560,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Retrieve the feed link for a category.
</span><span class="cx"> *
</span><del>- * Returns a link to the feed for all post in a given category. A specific feed
</del><ins>+ * Returns a link to the feed for all posts in a given category. A specific feed
</ins><span class="cx"> * can be requested or left blank to get the default feed.
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="lines">@@ -576,9 +576,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Retrieve the feed link for a taxonomy.
</del><ins>+ * Retrieve the feed link for a term.
</ins><span class="cx"> *
</span><del>- * Returns a link to the feed for all post in a given term. A specific feed
</del><ins>+ * Returns a link to the feed for all posts in a given term. A specific feed
</ins><span class="cx"> * can be requested or left blank to get the default feed.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0
</span><span class="lines">@@ -586,7 +586,7 @@
</span><span class="cx"> * @param int $term_id ID of a category.
</span><span class="cx"> * @param string $taxonomy Optional. Taxonomy of $term_id
</span><span class="cx"> * @param string $feed Optional. Feed type.
</span><del>- * @return string Link to the feed for the taxonomy specified by $term_id and $taxonomy.
</del><ins>+ * @return string Link to the feed for the term specified by $term_id and $taxonomy.
</ins><span class="cx"> */
</span><span class="cx"> function get_term_feed_link( $term_id, $taxonomy = 'category', $feed = '' ) {
</span><span class="cx"> global $wp_rewrite;
</span><span class="lines">@@ -895,7 +895,7 @@
</span><span class="cx"> * @since 2.3.0
</span><span class="cx"> *
</span><span class="cx"> * @param int $id Optional. Post ID.
</span><del>- * @param string $context Optional, default to display. How to write the '&', defaults to '&amp;'.
</del><ins>+ * @param string $context Optional, defaults to display. How to write the '&', defaults to '&amp;'.
</ins><span class="cx"> * @return string
</span><span class="cx"> */
</span><span class="cx"> function get_edit_post_link( $id = 0, $context = 'display' ) {
</span><span class="lines">@@ -1064,7 +1064,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 1.5.0
</span><span class="cx"> *
</span><del>- * @param bool $in_same_cat Optional. Whether post should be in same category.
</del><ins>+ * @param bool $in_same_cat Optional. Whether post should be in a same category.
</ins><span class="cx"> * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs.
</span><span class="cx"> * @return mixed Post object if successful. Null if global $post is not set. Empty string if no corresponding post exists.
</span><span class="cx"> */
</span><span class="lines">@@ -1077,7 +1077,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 1.5.0
</span><span class="cx"> *
</span><del>- * @param bool $in_same_cat Optional. Whether post should be in same category.
</del><ins>+ * @param bool $in_same_cat Optional. Whether post should be in a same category.
</ins><span class="cx"> * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs.
</span><span class="cx"> * @return mixed Post object if successful. Null if global $post is not set. Empty string if no corresponding post exists.
</span><span class="cx"> */
</span><span class="lines">@@ -1092,7 +1092,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.5.0
</span><span class="cx"> *
</span><del>- * @param bool $in_same_cat Optional. Whether post should be in same category.
</del><ins>+ * @param bool $in_same_cat Optional. Whether post should be in a same category.
</ins><span class="cx"> * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs.
</span><span class="cx"> * @param bool $previous Optional. Whether to retrieve previous post.
</span><span class="cx"> * @return mixed Post object if successful. Null if global $post is not set. Empty string if no corresponding post exists.
</span><span class="lines">@@ -1170,9 +1170,9 @@
</span><span class="cx"> * @since 2.8.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $title Optional. Link title format.
</span><del>- * @param bool $in_same_cat Optional. Whether link should be in same category.
</del><ins>+ * @param bool $in_same_cat Optional. Whether link should be in a same category.
</ins><span class="cx"> * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs.
</span><del>- * @param bool $previous Optional, default is true. Whether display link to previous post.
</del><ins>+ * @param bool $previous Optional, default is true. Whether to display link to previous or next post.
</ins><span class="cx"> * @return string
</span><span class="cx"> */
</span><span class="cx"> function get_adjacent_post_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '', $previous = true) {
</span><span class="lines">@@ -1207,7 +1207,7 @@
</span><span class="cx"> * @since 2.8.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $title Optional. Link title format.
</span><del>- * @param bool $in_same_cat Optional. Whether link should be in same category.
</del><ins>+ * @param bool $in_same_cat Optional. Whether link should be in a same category.
</ins><span class="cx"> * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs.
</span><span class="cx"> */
</span><span class="cx"> function adjacent_posts_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '') {
</span><span class="lines">@@ -1218,7 +1218,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Display relational links for the posts adjacent to the current post for single post pages.
</span><span class="cx"> *
</span><del>- * This is meant to be attached to actions like 'wp_head'. Do not call this directly in plugins or theme templates.
</del><ins>+ * This is meant to be attached to actions like 'wp_head'. Do not call this directly in plugins or theme templates.
</ins><span class="cx"> * @since 3.0.0
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="lines">@@ -1234,7 +1234,7 @@
</span><span class="cx"> * @since 2.8.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $title Optional. Link title format.
</span><del>- * @param bool $in_same_cat Optional. Whether link should be in same category.
</del><ins>+ * @param bool $in_same_cat Optional. Whether link should be in a same category.
</ins><span class="cx"> * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs.
</span><span class="cx"> */
</span><span class="cx"> function next_post_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '') {
</span><span class="lines">@@ -1247,7 +1247,7 @@
</span><span class="cx"> * @since 2.8.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $title Optional. Link title format.
</span><del>- * @param bool $in_same_cat Optional. Whether link should be in same category.
</del><ins>+ * @param bool $in_same_cat Optional. Whether link should be in a same category.
</ins><span class="cx"> * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs.
</span><span class="cx"> */
</span><span class="cx"> function prev_post_rel_link($title = '%title', $in_same_cat = false, $excluded_categories = '') {
</span><span class="lines">@@ -1258,11 +1258,11 @@
</span><span class="cx"> * Retrieve boundary post.
</span><span class="cx"> *
</span><span class="cx"> * Boundary being either the first or last post by publish date within the constraints specified
</span><del>- * by in same category or excluded categories.
</del><ins>+ * by $in_same_cat or $excluded_categories.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.8.0
</span><span class="cx"> *
</span><del>- * @param bool $in_same_cat Optional. Whether returned post should be in same category.
</del><ins>+ * @param bool $in_same_cat Optional. Whether returned post should be in a same category.
</ins><span class="cx"> * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs.
</span><span class="cx"> * @param bool $start Optional. Whether to retrieve first or last post.
</span><span class="cx"> * @return object
</span><span class="lines">@@ -1306,7 +1306,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $format Optional. Link anchor format.
</span><span class="cx"> * @param string $link Optional. Link permalink format.
</span><del>- * @param bool $in_same_cat Optional. Whether link should be in same category.
</del><ins>+ * @param bool $in_same_cat Optional. Whether link should be in a same category.
</ins><span class="cx"> * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs.
</span><span class="cx"> */
</span><span class="cx"> function previous_post_link($format='&laquo; %link', $link='%title', $in_same_cat = false, $excluded_categories = '') {
</span><span class="lines">@@ -1320,7 +1320,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $format Optional. Link anchor format.
</span><span class="cx"> * @param string $link Optional. Link permalink format.
</span><del>- * @param bool $in_same_cat Optional. Whether link should be in same category.
</del><ins>+ * @param bool $in_same_cat Optional. Whether link should be in a same category.
</ins><span class="cx"> * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs.
</span><span class="cx"> */
</span><span class="cx"> function next_post_link($format='%link &raquo;', $link='%title', $in_same_cat = false, $excluded_categories = '') {
</span><span class="lines">@@ -1336,9 +1336,9 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string $format Link anchor format.
</span><span class="cx"> * @param string $link Link permalink format.
</span><del>- * @param bool $in_same_cat Optional. Whether link should be in same category.
</del><ins>+ * @param bool $in_same_cat Optional. Whether link should be in a same category.
</ins><span class="cx"> * @param array|string $excluded_categories Optional. Array or comma-separated list of excluded category IDs.
</span><del>- * @param bool $previous Optional, default is true. Whether display link to previous post.
</del><ins>+ * @param bool $previous Optional, default is true. Whether to display link to previous or next post.
</ins><span class="cx"> */
</span><span class="cx"> function adjacent_post_link($format, $link, $in_same_cat = false, $excluded_categories = '', $previous = true) {
</span><span class="cx"> if ( $previous && is_attachment() )
</span><span class="lines">@@ -1370,7 +1370,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Retrieve get links for page numbers.
</del><ins>+ * Retrieve links for page numbers.
</ins><span class="cx"> *
</span><span class="cx"> * @since 1.5.0
</span><span class="cx"> *
</span><span class="lines">@@ -1432,7 +1432,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Retrieve next posts pages link.
</del><ins>+ * Retrieve next posts page link.
</ins><span class="cx"> *
</span><span class="cx"> * Backported from 2.1.3 to 2.0.10.
</span><span class="cx"> *
</span><span class="lines">@@ -1454,7 +1454,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Display or return the next posts pages link.
</del><ins>+ * Display or return the next posts page link.
</ins><span class="cx"> *
</span><span class="cx"> * @since 0.71
</span><span class="cx"> *
</span><span class="lines">@@ -1471,7 +1471,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Return the next posts pages link.
</del><ins>+ * Return the next posts page link.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.7.0
</span><span class="cx"> *
</span><span class="lines">@@ -1500,7 +1500,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Display the next posts pages link.
</del><ins>+ * Display the next posts page link.
</ins><span class="cx"> *
</span><span class="cx"> * @since 0.71
</span><span class="cx"> * @uses get_next_posts_link()
</span><span class="lines">@@ -1513,7 +1513,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Retrieve previous post pages link.
</del><ins>+ * Retrieve previous posts page link.
</ins><span class="cx"> *
</span><span class="cx"> * Will only return string, if not on a single page or post.
</span><span class="cx"> *
</span><span class="lines">@@ -1535,7 +1535,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Display or return the previous posts pages link.
</del><ins>+ * Display or return the previous posts page link.
</ins><span class="cx"> *
</span><span class="cx"> * @since 0.71
</span><span class="cx"> *
</span><span class="lines">@@ -1551,7 +1551,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Return the previous posts pages link.
</del><ins>+ * Return the previous posts page link.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.7.0
</span><span class="cx"> *
</span><span class="lines">@@ -1636,7 +1636,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Retrieve page numbers links.
</del><ins>+ * Retrieve comments page number link.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.7.0
</span><span class="cx"> *
</span><span class="lines">@@ -1672,7 +1672,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Return the link to next comments pages.
</del><ins>+ * Return the link to next comments page.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.7.1
</span><span class="cx"> *
</span><span class="lines">@@ -1706,7 +1706,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Display the link to next comments pages.
</del><ins>+ * Display the link to next comments page.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.7.0
</span><span class="cx"> *
</span><span class="lines">@@ -1759,7 +1759,7 @@
</span><span class="cx"> * @see paginate_links()
</span><span class="cx"> * @since 2.7.0
</span><span class="cx"> *
</span><del>- * @param string|array $args Optional args. See paginate_links.
</del><ins>+ * @param string|array $args Optional args. See paginate_links().
</ins><span class="cx"> * @return string Markup for pagination links.
</span><span class="cx"> */
</span><span class="cx"> function paginate_comments_links($args = array()) {
</span><span class="lines">@@ -1825,7 +1825,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Retrieve the home url for the current site.
</span><span class="cx"> *
</span><del>- * Returns the 'home' option with the appropriate protocol, 'https' if
</del><ins>+ * Returns the 'home' option with the appropriate protocol, 'https' if
</ins><span class="cx"> * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is
</span><span class="cx"> * overridden.
</span><span class="cx"> *
</span><span class="lines">@@ -1835,7 +1835,7 @@
</span><span class="cx"> * @uses get_home_url()
</span><span class="cx"> *
</span><span class="cx"> * @param string $path (optional) Path relative to the home url.
</span><del>- * @param string $scheme (optional) Scheme to give the home url context. Currently 'http','https'
</del><ins>+ * @param string $scheme (optional) Scheme to give the home url context. Currently 'http', 'https'.
</ins><span class="cx"> * @return string Home url link with optional path appended.
</span><span class="cx"> */
</span><span class="cx"> function home_url( $path = '', $scheme = null ) {
</span><span class="lines">@@ -1845,7 +1845,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Retrieve the home url for a given site.
</span><span class="cx"> *
</span><del>- * Returns the 'home' option with the appropriate protocol, 'https' if
</del><ins>+ * Returns the 'home' option with the appropriate protocol, 'https' if
</ins><span class="cx"> * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is
</span><span class="cx"> * overridden.
</span><span class="cx"> *
</span><span class="lines">@@ -1854,7 +1854,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param int $blog_id (optional) Blog ID. Defaults to current blog.
</span><span class="cx"> * @param string $path (optional) Path relative to the home url.
</span><del>- * @param string $scheme (optional) Scheme to give the home url context. Currently 'http','https'
</del><ins>+ * @param string $scheme (optional) Scheme to give the home url context. Currently 'http', 'https'.
</ins><span class="cx"> * @return string Home url link with optional path appended.
</span><span class="cx"> */
</span><span class="cx"> function get_home_url( $blog_id = null, $path = '', $scheme = null ) {
</span><span class="lines">@@ -1880,7 +1880,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Retrieve the site url for the current site.
</span><span class="cx"> *
</span><del>- * Returns the 'site_url' option with the appropriate protocol, 'https' if
</del><ins>+ * Returns the 'site_url' option with the appropriate protocol, 'https' if
</ins><span class="cx"> * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is
</span><span class="cx"> * overridden.
</span><span class="cx"> *
</span><span class="lines">@@ -1890,7 +1890,7 @@
</span><span class="cx"> * @uses get_site_url()
</span><span class="cx"> *
</span><span class="cx"> * @param string $path Optional. Path relative to the site url.
</span><del>- * @param string $scheme Optional. Scheme to give the site url context. Currently 'http','https', 'login', 'login_post', or 'admin'.
</del><ins>+ * @param string $scheme Optional. Scheme to give the site url context. Currently 'http', 'https', 'login', 'login_post', or 'admin'.
</ins><span class="cx"> * @return string Site url link with optional path appended.
</span><span class="cx"> */
</span><span class="cx"> function site_url( $path = '', $scheme = null ) {
</span><span class="lines">@@ -1900,7 +1900,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Retrieve the site url for a given site.
</span><span class="cx"> *
</span><del>- * Returns the 'site_url' option with the appropriate protocol, 'https' if
</del><ins>+ * Returns the 'site_url' option with the appropriate protocol, 'https' if
</ins><span class="cx"> * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is
</span><span class="cx"> * overridden.
</span><span class="cx"> *
</span><span class="lines">@@ -1909,7 +1909,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param int $blog_id (optional) Blog ID. Defaults to current blog.
</span><span class="cx"> * @param string $path Optional. Path relative to the site url.
</span><del>- * @param string $scheme Optional. Scheme to give the site url context. Currently 'http','https', 'login', 'login_post', or 'admin'.
</del><ins>+ * @param string $scheme Optional. Scheme to give the site url context. Currently 'http', 'https', 'login', 'login_post', or 'admin'.
</ins><span class="cx"> * @return string Site url link with optional path appended.
</span><span class="cx"> */
</span><span class="cx"> function get_site_url( $blog_id = null, $path = '', $scheme = null ) {
</span><span class="lines">@@ -1946,9 +1946,9 @@
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @since 2.6.0
</span><span class="cx"> *
</span><del>- * @param string $path Optional path relative to the admin url
</del><ins>+ * @param string $path Optional path relative to the admin url.
</ins><span class="cx"> * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
</span><del>- * @return string Admin url link with optional path appended
</del><ins>+ * @return string Admin url link with optional path appended.
</ins><span class="cx"> */
</span><span class="cx"> function admin_url( $path = '', $scheme = 'admin' ) {
</span><span class="cx"> return get_admin_url(null, $path, $scheme);
</span><span class="lines">@@ -1961,9 +1961,9 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> *
</span><span class="cx"> * @param int $blog_id (optional) Blog ID. Defaults to current blog.
</span><del>- * @param string $path Optional path relative to the admin url
</del><ins>+ * @param string $path Optional path relative to the admin url.
</ins><span class="cx"> * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
</span><del>- * @return string Admin url link with optional path appended
</del><ins>+ * @return string Admin url link with optional path appended.
</ins><span class="cx"> */
</span><span class="cx"> function get_admin_url( $blog_id = null, $path = '', $scheme = 'admin' ) {
</span><span class="cx"> $url = get_site_url($blog_id, 'wp-admin/', $scheme);
</span><span class="lines">@@ -2054,7 +2054,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Retrieve the site url for the current network.
</span><span class="cx"> *
</span><del>- * Returns the site url with the appropriate protocol, 'https' if
</del><ins>+ * Returns the site url with the appropriate protocol, 'https' if
</ins><span class="cx"> * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is
</span><span class="cx"> * overridden.
</span><span class="cx"> *
</span><span class="lines">@@ -2062,7 +2062,7 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $path Optional. Path relative to the site url.
</span><del>- * @param string $scheme Optional. Scheme to give the site url context. Currently 'http','https', 'login', 'login_post', or 'admin'.
</del><ins>+ * @param string $scheme Optional. Scheme to give the site url context. Currently 'http', 'https', 'login', 'login_post', or 'admin'.
</ins><span class="cx"> * @return string Site url link with optional path appended.
</span><span class="cx"> */
</span><span class="cx"> function network_site_url( $path = '', $scheme = null ) {
</span><span class="lines">@@ -2094,7 +2094,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Retrieve the home url for the current network.
</span><span class="cx"> *
</span><del>- * Returns the home url with the appropriate protocol, 'https' if
</del><ins>+ * Returns the home url with the appropriate protocol, 'https' if
</ins><span class="cx"> * is_ssl() and 'http' otherwise. If $scheme is 'http' or 'https', is_ssl() is
</span><span class="cx"> * overridden.
</span><span class="cx"> *
</span><span class="lines">@@ -2102,7 +2102,7 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $path (optional) Path relative to the home url.
</span><del>- * @param string $scheme (optional) Scheme to give the home url context. Currently 'http','https'
</del><ins>+ * @param string $scheme (optional) Scheme to give the home url context. Currently 'http', 'https'.
</ins><span class="cx"> * @return string Home url link with optional path appended.
</span><span class="cx"> */
</span><span class="cx"> function network_home_url( $path = '', $scheme = null ) {
</span><span class="lines">@@ -2130,9 +2130,9 @@
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> *
</span><del>- * @param string $path Optional path relative to the admin url
</del><ins>+ * @param string $path Optional path relative to the admin url.
</ins><span class="cx"> * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
</span><del>- * @return string Admin url link with optional path appended
</del><ins>+ * @return string Admin url link with optional path appended.
</ins><span class="cx"> */
</span><span class="cx"> function network_admin_url( $path = '', $scheme = 'admin' ) {
</span><span class="cx"> if ( ! is_multisite() )
</span><span class="lines">@@ -2152,9 +2152,9 @@
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> *
</span><del>- * @param string $path Optional path relative to the admin url
</del><ins>+ * @param string $path Optional path relative to the admin url.
</ins><span class="cx"> * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
</span><del>- * @return string Admin url link with optional path appended
</del><ins>+ * @return string Admin url link with optional path appended.
</ins><span class="cx"> */
</span><span class="cx"> function user_admin_url( $path = '', $scheme = 'admin' ) {
</span><span class="cx"> $url = network_site_url('wp-admin/user/', $scheme);
</span><span class="lines">@@ -2171,9 +2171,9 @@
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> *
</span><del>- * @param string $path Optional path relative to the admin url
</del><ins>+ * @param string $path Optional path relative to the admin url.
</ins><span class="cx"> * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
</span><del>- * @return string Admin url link with optional path appended
</del><ins>+ * @return string Admin url link with optional path appended.
</ins><span class="cx"> */
</span><span class="cx"> function self_admin_url($path = '', $scheme = 'admin') {
</span><span class="cx"> if ( is_network_admin() )
</span><span class="lines">@@ -2187,16 +2187,16 @@
</span><span class="cx"> /**
</span><span class="cx"> * Get the URL to the user's dashboard.
</span><span class="cx"> *
</span><del>- * If a user does not belong to any sites, the global user dashboard is used. If the user belongs to the current site,
- * the dashboard for the current site is returned. If the user cannot edit the current site, the dashboard to the user's
</del><ins>+ * If a user does not belong to any site, the global user dashboard is used. If the user belongs to the current site,
+ * the dashboard for the current site is returned. If the user cannot edit the current site, the dashboard to the user's
</ins><span class="cx"> * primary blog is returned.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.1.0
</span><span class="cx"> *
</span><span class="cx"> * @param int $user_id User ID
</span><del>- * @param string $path Optional path relative to the dashboard. Use only paths known to both blog and user admins.
</del><ins>+ * @param string $path Optional path relative to the dashboard. Use only paths known to both blog and user admins.
</ins><span class="cx"> * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
</span><del>- * @return string Dashboard url link with optional path appended
</del><ins>+ * @return string Dashboard url link with optional path appended.
</ins><span class="cx"> */
</span><span class="cx"> function get_dashboard_url( $user_id, $path = '', $scheme = 'admin' ) {
</span><span class="cx"> $user_id = (int) $user_id;
</span><span class="lines">@@ -2229,7 +2229,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param int $user User ID
</span><span class="cx"> * @param string $scheme The scheme to use. Default is 'admin', which obeys force_ssl_admin() and is_ssl(). 'http' or 'https' can be passed to force those schemes.
</span><del>- * @return string Dashboard url link with optional path appended
</del><ins>+ * @return string Dashboard url link with optional path appended.
</ins><span class="cx"> */
</span><span class="cx"> function get_edit_profile_url( $user, $scheme = 'admin' ) {
</span><span class="cx"> $user = (int) $user;
</span><span class="lines">@@ -2245,7 +2245,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Output rel=canonical for singular queries
</del><ins>+ * Output rel=canonical for singular queries.
</ins><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @since 2.9.0
</span><span class="lines">@@ -2265,14 +2265,14 @@
</span><span class="cx"> /**
</span><span class="cx"> * Return a shortlink for a post, page, attachment, or blog.
</span><span class="cx"> *
</span><del>- * This function exists to provide a shortlink tag that all themes and plugins can target. A plugin must hook in to
- * provide the actual shortlinks. Default shortlink support is limited to providing ?p= style links for posts.
- * Plugins can short circuit this function via the pre_get_shortlink filter or filter the output
</del><ins>+ * This function exists to provide a shortlink tag that all themes and plugins can target. A plugin must hook in to
+ * provide the actual shortlinks. Default shortlink support is limited to providing ?p= style links for posts.
+ * Plugins can short-circuit this function via the pre_get_shortlink filter or filter the output
</ins><span class="cx"> * via the get_shortlink filter.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0.
</span><span class="cx"> *
</span><del>- * @param int $id A post or blog id. Default is 0, which means the current post or blog.
</del><ins>+ * @param int $id A post or blog id. Default is 0, which means the current post or blog.
</ins><span class="cx"> * @param string $context Whether the id is a 'blog' id, 'post' id, or 'media' id. If 'post', the post_type of the post is consulted. If 'query', the current query is consulted to determine the id and context. Default is 'post'.
</span><span class="cx"> * @param bool $allow_slugs Whether to allow post slugs in the shortlink. It is up to the plugin how and whether to honor this.
</span><span class="cx"> * @return string A shortlink or an empty string if no shortlink exists for the requested resource or if shortlinks are not enabled.
</span><span class="lines">@@ -2352,10 +2352,10 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> *
</span><del>- * @param string $text Optional The link text or HTML to be displayed. Defaults to 'This is the short link.'
- * @param string $title Optional The tooltip for the link. Must be sanitized. Defaults to the sanitized post title.
</del><ins>+ * @param string $text Optional The link text or HTML to be displayed. Defaults to 'This is the short link.'
+ * @param string $title Optional The tooltip for the link. Must be sanitized. Defaults to the sanitized post title.
</ins><span class="cx"> * @param string $before Optional HTML to display before the link.
</span><del>- * @param string $before Optional HTML to display after the link.
</del><ins>+ * @param string $after Optional HTML to display after the link.
</ins><span class="cx"> */
</span><span class="cx"> function the_shortlink( $text = '', $title = '', $before = '', $after = '' ) {
</span><span class="cx"> global $post;
</span></span></pre></div>
<a id="trunkwpincludesloadphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/load.php (18826 => 18827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/load.php 2011-09-29 22:33:51 UTC (rev 18826)
+++ trunk/wp-includes/load.php 2011-09-29 22:57:43 UTC (rev 18827)
</span><span class="lines">@@ -186,7 +186,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @access private
</span><span class="cx"> * @since 0.71
</span><del>- * @global int $timestart Seconds and Microseconds added together from when function is called.
</del><ins>+ * @global int $timestart Seconds and microseconds added together from when function is called.
</ins><span class="cx"> * @return bool Always returns true.
</span><span class="cx"> */
</span><span class="cx"> function timer_start() {
</span><span class="lines">@@ -210,11 +210,11 @@
</span><span class="cx"> * timer_stop(1);
</span><span class="cx"> * </code>
</span><span class="cx"> * which will do what the above does. If you need the result, you can assign it to a variable, but
</span><del>- * most cases, you only need to echo it.
</del><ins>+ * in most cases, you only need to echo it.
</ins><span class="cx"> *
</span><span class="cx"> * @since 0.71
</span><del>- * @global int $timestart Seconds and Microseconds added together from when timer_start() is called
- * @global int $timeend Seconds and Microseconds added together from when function is called
</del><ins>+ * @global int $timestart Seconds and microseconds added together from when timer_start() is called
+ * @global int $timeend Seconds and microseconds added together from when function is called
</ins><span class="cx"> *
</span><span class="cx"> * @param int $display Use '0' or null to not echo anything and 1 to echo the total time
</span><span class="cx"> * @param int $precision The amount of digits from the right of the decimal to display. Default is 3.
</span><span class="lines">@@ -287,9 +287,9 @@
</span><span class="cx"> *
</span><span class="cx"> * To set directory manually, define <code>WP_LANG_DIR</code> in wp-config.php.
</span><span class="cx"> *
</span><del>- * If the language directory exists within WP_CONTENT_DIR that is used
- * Otherwise if the language directory exists within WPINC, that's used
- * Finally, If neither of the preceeding directories is found,
</del><ins>+ * If the language directory exists within WP_CONTENT_DIR, that is used.
+ * Otherwise if the language directory exists within WPINC, that's used.
+ * Finally, if neither of the preceding directories are found,
</ins><span class="cx"> * WP_CONTENT_DIR/languages is used.
</span><span class="cx"> *
</span><span class="cx"> * The WP_LANG_DIR constant was introduced in 2.1.0.
</span><span class="lines">@@ -396,7 +396,7 @@
</span><span class="cx"> } else if ( !$_wp_using_ext_object_cache && file_exists( WP_CONTENT_DIR . '/object-cache.php' ) ) {
</span><span class="cx"> // Sometimes advanced-cache.php can load object-cache.php before it is loaded here.
</span><span class="cx"> // This breaks the function_exists check above and can result in $_wp_using_ext_object_cache
</span><del>- // being set incorrectly. Double check if an external cache exists.
</del><ins>+ // being set incorrectly. Double check if an external cache exists.
</ins><span class="cx"> $_wp_using_ext_object_cache = true;
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludeslocalephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/locale.php (18826 => 18827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/locale.php 2011-09-29 22:33:51 UTC (rev 18826)
+++ trunk/wp-includes/locale.php 2011-09-29 22:57:43 UTC (rev 18827)
</span><span class="lines">@@ -25,7 +25,7 @@
</span><span class="cx"> * Stores the translated strings for the one character weekday names.
</span><span class="cx"> *
</span><span class="cx"> * There is a hack to make sure that Tuesday and Thursday, as well
</span><del>- * as Sunday and Saturday don't conflict. See init() method for more.
</del><ins>+ * as Sunday and Saturday, don't conflict. See init() method for more.
</ins><span class="cx"> *
</span><span class="cx"> * @see WP_Locale::init() for how to handle the hack.
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (18826 => 18827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2011-09-29 22:33:51 UTC (rev 18826)
+++ trunk/wp-includes/media.php 2011-09-29 22:57:43 UTC (rev 18827)
</span><span class="lines">@@ -17,7 +17,7 @@
</span><span class="cx"> * than the supported will result in the content_width size or 500 if that is
</span><span class="cx"> * not set.
</span><span class="cx"> *
</span><del>- * Finally, there is a filter named, 'editor_max_image_size' that will be called
</del><ins>+ * Finally, there is a filter named 'editor_max_image_size', that will be called
</ins><span class="cx"> * on the calculated array for width and height, respectively. The second
</span><span class="cx"> * parameter will be the value that was in the $size parameter. The returned
</span><span class="cx"> * type for the hook is an array with the width as the first element and the
</span><span class="lines">@@ -177,6 +177,8 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Registers a new image size
</span><ins>+ *
+ * @since 2.9.0
</ins><span class="cx"> */
</span><span class="cx"> function add_image_size( $name, $width = 0, $height = 0, $crop = false ) {
</span><span class="cx"> global $_wp_additional_image_sizes;
</span><span class="lines">@@ -185,6 +187,8 @@
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="cx"> * Registers an image size for the post thumbnail
</span><ins>+ *
+ * @since 2.9.0
</ins><span class="cx"> */
</span><span class="cx"> function set_post_thumbnail_size( $width = 0, $height = 0, $crop = false ) {
</span><span class="cx"> add_image_size( 'post-thumbnail', $width, $height, $crop );
</span><span class="lines">@@ -329,7 +333,7 @@
</span><span class="cx"> * @param int $dest_w New width.
</span><span class="cx"> * @param int $dest_h New height.
</span><span class="cx"> * @param bool $crop Optional, default is false. Whether to crop image or resize.
</span><del>- * @return bool|array False, on failure. Returned array matches parameters for imagecopyresampled() PHP function.
</del><ins>+ * @return bool|array False on failure. Returned array matches parameters for imagecopyresampled() PHP function.
</ins><span class="cx"> */
</span><span class="cx"> function image_resize_dimensions($orig_w, $orig_h, $dest_w, $dest_h, $crop = false) {
</span><span class="cx">
</span><span class="lines">@@ -398,7 +402,7 @@
</span><span class="cx"> * @param int $max_w Maximum width to resize to.
</span><span class="cx"> * @param int $max_h Maximum height to resize to.
</span><span class="cx"> * @param bool $crop Optional. Whether to crop image or resize.
</span><del>- * @param string $suffix Optional. File Suffix.
</del><ins>+ * @param string $suffix Optional. File suffix.
</ins><span class="cx"> * @param string $dest_path Optional. New image file path.
</span><span class="cx"> * @param int $jpeg_quality Optional, default is 90. Image quality percentage.
</span><span class="cx"> * @return mixed WP_Error on failure. String with new destination path.
</span><span class="lines">@@ -669,9 +673,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Adds a 'wp-post-image' class to post thumbnail thumbnails
</del><ins>+ * Adds a 'wp-post-image' class to post thumbnails
</ins><span class="cx"> * Uses the begin_fetch_post_thumbnail_html and end_fetch_post_thumbnail_html action hooks to
</span><del>- * dynamically add/remove itself so as to only filter post thumbnail thumbnails
</del><ins>+ * dynamically add/remove itself so as to only filter post thumbnails
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.9.0
</span><span class="cx"> * @param array $attr Attributes including src, class, alt, title
</span><span class="lines">@@ -752,7 +756,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.5.0
</span><span class="cx"> *
</span><del>- * @param array $attr Attributes attributed to the shortcode.
</del><ins>+ * @param array $attr Attributes of the shortcode.
</ins><span class="cx"> * @return string HTML content to display gallery.
</span><span class="cx"> */
</span><span class="cx"> function gallery_shortcode($attr) {
</span><span class="lines">@@ -906,7 +910,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.5.0
</span><span class="cx"> *
</span><del>- * @param bool $prev Optional. Default is true to display previous link, true for next.
</del><ins>+ * @param bool $prev Optional. Default is true to display previous link, false for next.
</ins><span class="cx"> */
</span><span class="cx"> function adjacent_image_link($prev = true, $size = 'thumbnail', $text = false) {
</span><span class="cx"> global $post;
</span><span class="lines">@@ -1079,7 +1083,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * If a post/page was saved, then output Javascript to make
</del><ins>+ * If a post/page was saved, then output JavaScript to make
</ins><span class="cx"> * an AJAX request that will call WP_Embed::cache_oembed().
</span><span class="cx"> */
</span><span class="cx"> function maybe_run_ajax_cache() {
</span><span class="lines">@@ -1373,7 +1377,7 @@
</span><span class="cx"> * @uses WP_oEmbed::get_html()
</span><span class="cx"> *
</span><span class="cx"> * @param string $url The URL that should be embedded.
</span><del>- * @param array $args Addtional arguments and parameters.
</del><ins>+ * @param array $args Additional arguments and parameters.
</ins><span class="cx"> * @return string The original URL on failure or the embed HTML on success.
</span><span class="cx"> */
</span><span class="cx"> function wp_oembed_get( $url, $args = '' ) {
</span></span></pre></div>
<a id="trunkwpincludespomotranslationsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pomo/translations.php (18826 => 18827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pomo/translations.php 2011-09-29 22:33:51 UTC (rev 18826)
+++ trunk/wp-includes/pomo/translations.php 2011-09-29 22:57:43 UTC (rev 18827)
</span><span class="lines">@@ -81,7 +81,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Given the number of items, returns the 0-based index of the plural form to use
</span><span class="cx"> *
</span><del>- * Here, in the base Translations class, the commong logic for English is implmented:
</del><ins>+ * Here, in the base Translations class, the common logic for English is implemented:
</ins><span class="cx"> * 0 if there is one element, 1 otherwise
</span><span class="cx"> *
</span><span class="cx"> * This function should be overrided by the sub-classes. For example MO/PO can derive the logic
</span></span></pre></div>
<a id="trunkwpincludespostthumbnailtemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post-thumbnail-template.php (18826 => 18827)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post-thumbnail-template.php 2011-09-29 22:33:51 UTC (rev 18826)
+++ trunk/wp-includes/post-thumbnail-template.php 2011-09-29 22:57:43 UTC (rev 18827)
</span><span class="lines">@@ -50,7 +50,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Update cache for thumbnails in the current loop
</span><span class="cx"> *
</span><del>- * @sicne 3.2
</del><ins>+ * @since 3.2
</ins><span class="cx"> */
</span><span class="cx"> function update_post_thumbnail_cache() {
</span><span class="cx"> global $wp_query;
</span></span></pre>
</div>
</div>
</body>
</html>