<!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>[17925] trunk: Fix typos and inconsistencies in PHPdoc / function declarations.</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://trac.wordpress.org/changeset/17925">17925</a></dd>
<dt>Author</dt> <dd>westi</dd>
<dt>Date</dt> <dd>2011-05-14 09:50:20 +0000 (Sat, 14 May 2011)</dd>
</dl>
<h3>Log Message</h3>
<pre>Fix typos and inconsistencies in PHPdoc / function declarations. See <a href="http://trac.wordpress.org/ticket/17414">#17414</a> props duck_</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminpluginsphp">trunk/wp-admin/plugins.php</a></li>
<li><a href="#trunkwpincludesclasshttpphp">trunk/wp-includes/class-http.php</a></li>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
<li><a href="#trunkwpincludesl10nphp">trunk/wp-includes/l10n.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminpluginsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/plugins.php (17924 => 17925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/plugins.php 2011-05-14 04:40:48 UTC (rev 17924)
+++ trunk/wp-admin/plugins.php 2011-05-14 09:50:20 UTC (rev 17925)
</span><span class="lines">@@ -59,7 +59,7 @@
</span><span class="cx"> update_option('recently_activated', $recent);
</span><span class="cx"> }
</span><span class="cx"> if ( isset($_GET['from']) && 'import' == $_GET['from'] ) {
</span><del>- wp_redirect( self_admin_url("import.php?import=" . str_replace('-importer', '', dirname($plugin))) ); // overrides the ?error=true one above and redirects to the Imports page, striping the -importer suffix
</del><ins>+ wp_redirect( self_admin_url("import.php?import=" . str_replace('-importer', '', dirname($plugin))) ); // overrides the ?error=true one above and redirects to the Imports page, stripping the -importer suffix
</ins><span class="cx"> } else {
</span><span class="cx"> wp_redirect( self_admin_url("plugins.php?activate=true&plugin_status=$status&paged=$page&s=$s") ); // overrides the ?error=true one above
</span><span class="cx"> }
</span></span></pre></div>
<a id="trunkwpincludesclasshttpphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/class-http.php (17924 => 17925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/class-http.php 2011-05-14 04:40:48 UTC (rev 17924)
+++ trunk/wp-includes/class-http.php 2011-05-14 09:50:20 UTC (rev 17925)
</span><span class="lines">@@ -192,7 +192,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Tests which transports are capabable of supporting the request.
</del><ins>+ * Tests which transports are capable of supporting the request.
</ins><span class="cx"> *
</span><span class="cx"> * @since 3.2.0
</span><span class="cx"> * @access private
</span><span class="lines">@@ -247,7 +247,7 @@
</span><span class="cx"> if ( !$class )
</span><span class="cx"> return new WP_Error( 'http_failure', __( 'There are no HTTP transports available which can complete the requested request.' ) );
</span><span class="cx">
</span><del>- // Transport claims to support request, Instantate it and give it a whirl.
</del><ins>+ // Transport claims to support request, instantiate it and give it a whirl.
</ins><span class="cx"> if ( empty( $transports[$class] ) )
</span><span class="cx"> $transports[$class] = new $class;
</span><span class="cx">
</span></span></pre></div>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (17924 => 17925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2011-05-14 04:40:48 UTC (rev 17924)
+++ trunk/wp-includes/formatting.php 2011-05-14 09:50:20 UTC (rev 17925)
</span><span class="lines">@@ -1227,7 +1227,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.0.0
</span><span class="cx"> *
</span><del>- * @param array|string $value The array or string to be striped.
</del><ins>+ * @param array|string $value The array or string to be stripped.
</ins><span class="cx"> * @return array|string Stripped array (or string in the callback).
</span><span class="cx"> */
</span><span class="cx"> function stripslashes_deep($value) {
</span><span class="lines">@@ -2748,7 +2748,7 @@
</span><span class="cx"> * This function by default only applies to <a> tags, however this can be
</span><span class="cx"> * modified by the 3rd param.
</span><span class="cx"> *
</span><del>- * <b>NOTE:</b> Any current target attributed will be striped and replaced.
</del><ins>+ * <b>NOTE:</b> Any current target attributed will be stripped and replaced.
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.7.0
</span><span class="cx"> *
</span></span></pre></div>
<a id="trunkwpincludesl10nphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/l10n.php (17924 => 17925)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/l10n.php 2011-05-14 04:40:48 UTC (rev 17924)
+++ trunk/wp-includes/l10n.php 2011-05-14 09:50:20 UTC (rev 17925)
</span><span class="lines">@@ -186,8 +186,8 @@
</span><span class="cx"> * @param string $domain Optional. Domain to retrieve the translated text
</span><span class="cx"> * @return string Translated context string without pipe
</span><span class="cx"> */
</span><del>-function _x( $single, $context, $domain = 'default' ) {
- return translate_with_gettext_context( $single, $context, $domain );
</del><ins>+function _x( $text, $context, $domain = 'default' ) {
+ return translate_with_gettext_context( $text, $context, $domain );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> /**
</span><span class="lines">@@ -201,8 +201,8 @@
</span><span class="cx"> * @param string $domain Optional. Domain to retrieve the translated text
</span><span class="cx"> * @return string Translated context string without pipe
</span><span class="cx"> */
</span><del>-function _ex( $single, $context, $domain = 'default' ) {
- echo _x( $single, $context, $domain );
</del><ins>+function _ex( $text, $context, $domain = 'default' ) {
+ echo _x( $text, $context, $domain );
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> function esc_attr_x( $single, $context, $domain = 'default' ) {
</span><span class="lines">@@ -270,9 +270,9 @@
</span><span class="cx"> * $usable_text = sprintf( translate_nooped_plural( $message, $count ), $count );
</span><span class="cx"> *
</span><span class="cx"> * @since 2.5
</span><del>- * @param string $single Single form to be i18ned
</del><ins>+ * @param string $singular Single form to be i18ned
</ins><span class="cx"> * @param string $plural Plural form to be i18ned
</span><del>- * @return array array($single, $plural)
</del><ins>+ * @return array array($singular, $plural)
</ins><span class="cx"> */
</span><span class="cx"> function _n_noop( $singular, $plural ) {
</span><span class="cx"> return array( 0 => $singular, 1 => $plural, 'singular' => $singular, 'plural' => $plural, 'context' => null );
</span></span></pre>
</div>
</div>
</body>
</html>