<!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" /><style type="text/css"><!--
#msg dl { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer { 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 #fc0 solid; padding: 6px; }
#msg ul, pre { overflow: auto; }
#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>
<title>[15590] trunk: Phpdoc argument/@param cleanups.</title>
</head>
<body>
<div id="msg">
<dl>
<dt>Revision</dt> <dd><a href="http://trac.wordpress.org/changeset/15590">15590</a></dd>
<dt>Author</dt> <dd>nacin</dd>
<dt>Date</dt> <dd>2010-09-07 11:21:11 +0000 (Tue, 07 Sep 2010)</dd>
</dl>
<h3>Log Message</h3>
<pre>Phpdoc argument/@param cleanups. props duck_, see <a href="http://trac.wordpress.org/ticket/14783">#14783</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkwpadminincludesclasswpfilesystemdirectphp">trunk/wp-admin/includes/class-wp-filesystem-direct.php</a></li>
<li><a href="#trunkwpadminincludesmediaphp">trunk/wp-admin/includes/media.php</a></li>
<li><a href="#trunkwpadminincludesmetaboxesphp">trunk/wp-admin/includes/meta-boxes.php</a></li>
<li><a href="#trunkwpadminincludesmsphp">trunk/wp-admin/includes/ms.php</a></li>
<li><a href="#trunkwpadminincludespluginphp">trunk/wp-admin/includes/plugin.php</a></li>
<li><a href="#trunkwpadminincludespostphp">trunk/wp-admin/includes/post.php</a></li>
<li><a href="#trunkwpadminincludestemplatephp">trunk/wp-admin/includes/template.php</a></li>
<li><a href="#trunkwpincludesbookmarkphp">trunk/wp-includes/bookmark.php</a></li>
<li><a href="#trunkwpincludescachephp">trunk/wp-includes/cache.php</a></li>
<li><a href="#trunkwpincludescategorytemplatephp">trunk/wp-includes/category-template.php</a></li>
<li><a href="#trunkwpincludesclassesphp">trunk/wp-includes/classes.php</a></li>
<li><a href="#trunkwpincludescommenttemplatephp">trunk/wp-includes/comment-template.php</a></li>
<li><a href="#trunkwpincludescommentphp">trunk/wp-includes/comment.php</a></li>
<li><a href="#trunkwpincludesdeprecatedphp">trunk/wp-includes/deprecated.php</a></li>
<li><a href="#trunkwpincludesformattingphp">trunk/wp-includes/formatting.php</a></li>
<li><a href="#trunkwpincludesfunctionsphp">trunk/wp-includes/functions.php</a></li>
<li><a href="#trunkwpincludesfunctionswpscriptsphp">trunk/wp-includes/functions.wp-scripts.php</a></li>
<li><a href="#trunkwpincludesgeneraltemplatephp">trunk/wp-includes/general-template.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="#trunkwpincludesmediaphp">trunk/wp-includes/media.php</a></li>
<li><a href="#trunkwpincludesmetaphp">trunk/wp-includes/meta.php</a></li>
<li><a href="#trunkwpincludesnavmenuphp">trunk/wp-includes/nav-menu.php</a></li>
<li><a href="#trunkwpincludespluginphp">trunk/wp-includes/plugin.php</a></li>
<li><a href="#trunkwpincludespomostreamsphp">trunk/wp-includes/pomo/streams.php</a></li>
<li><a href="#trunkwpincludespostphp">trunk/wp-includes/post.php</a></li>
<li><a href="#trunkwpincludesqueryphp">trunk/wp-includes/query.php</a></li>
<li><a href="#trunkwpincludesrewritephp">trunk/wp-includes/rewrite.php</a></li>
<li><a href="#trunkwpincludestaxonomyphp">trunk/wp-includes/taxonomy.php</a></li>
<li><a href="#trunkwpincludesthemephp">trunk/wp-includes/theme.php</a></li>
<li><a href="#trunkwpincludesuserphp">trunk/wp-includes/user.php</a></li>
<li><a href="#trunkwpincludeswidgetsphp">trunk/wp-includes/widgets.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkwpadminincludesclasswpfilesystemdirectphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/class-wp-filesystem-direct.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/class-wp-filesystem-direct.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-admin/includes/class-wp-filesystem-direct.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -19,7 +19,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * constructor
</span><span class="cx"> *
</span><del>- * @param $arg mixed ingored argument
</del><ins>+ * @param mixed $arg ingored argument
</ins><span class="cx"> */
</span><span class="cx"> function WP_Filesystem_Direct($arg) {
</span><span class="cx"> $this->method = 'direct';
</span><span class="lines">@@ -36,7 +36,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Reads entire file into a string
</span><span class="cx"> *
</span><del>- * @param $file string Name of the file to read.
</del><ins>+ * @param string $file Name of the file to read.
</ins><span class="cx"> * @return string|bool The function returns the read data or false on failure.
</span><span class="cx"> */
</span><span class="cx"> function get_contents($file) {
</span><span class="lines">@@ -45,7 +45,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Reads entire file into an array
</span><span class="cx"> *
</span><del>- * @param $file string Path to the file.
</del><ins>+ * @param string $file Path to the file.
</ins><span class="cx"> * @return array|bool the file contents in an array or false on failure.
</span><span class="cx"> */
</span><span class="cx"> function get_contents_array($file) {
</span><span class="lines">@@ -54,9 +54,9 @@
</span><span class="cx"> /**
</span><span class="cx"> * Write a string to a file
</span><span class="cx"> *
</span><del>- * @param $file string Remote path to the file where to write the data.
- * @param $contents string The data to write.
- * @param $mode int (optional) The file permissions as octal number, usually 0644.
</del><ins>+ * @param string $file Remote path to the file where to write the data.
+ * @param string $contents The data to write.
+ * @param int $mode (optional) The file permissions as octal number, usually 0644.
</ins><span class="cx"> * @return bool False upon failure.
</span><span class="cx"> */
</span><span class="cx"> function put_contents($file, $contents, $mode = false ) {
</span><span class="lines">@@ -78,7 +78,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Change directory
</span><span class="cx"> *
</span><del>- * @param $dir string The new current directory.
</del><ins>+ * @param string $dir The new current directory.
</ins><span class="cx"> * @return bool Returns true on success or false on failure.
</span><span class="cx"> */
</span><span class="cx"> function chdir($dir) {
</span><span class="lines">@@ -87,9 +87,9 @@
</span><span class="cx"> /**
</span><span class="cx"> * Changes file group
</span><span class="cx"> *
</span><del>- * @param $file string Path to the file.
- * @param $group mixed A group name or number.
- * @param $recursive bool (optional) If set True changes file group recursivly. Defaults to False.
</del><ins>+ * @param string $file Path to the file.
+ * @param mixed $group A group name or number.
+ * @param bool $recursive (optional) If set True changes file group recursivly. Defaults to False.
</ins><span class="cx"> * @return bool Returns true on success or false on failure.
</span><span class="cx"> */
</span><span class="cx"> function chgrp($file, $group, $recursive = false) {
</span><span class="lines">@@ -110,9 +110,9 @@
</span><span class="cx"> /**
</span><span class="cx"> * Changes filesystem permissions
</span><span class="cx"> *
</span><del>- * @param $file string Path to the file.
- * @param $mode int (optional) The permissions as octal number, usually 0644 for files, 0755 for dirs.
- * @param $recursive bool (optional) If set True changes file group recursivly. Defaults to False.
</del><ins>+ * @param string $file Path to the file.
+ * @param int $mode (optional) The permissions as octal number, usually 0644 for files, 0755 for dirs.
+ * @param bool $recursive (optional) If set True changes file group recursivly. Defaults to False.
</ins><span class="cx"> * @return bool Returns true on success or false on failure.
</span><span class="cx"> */
</span><span class="cx"> function chmod($file, $mode = false, $recursive = false) {
</span><span class="lines">@@ -138,9 +138,9 @@
</span><span class="cx"> /**
</span><span class="cx"> * Changes file owner
</span><span class="cx"> *
</span><del>- * @param $file string Path to the file.
- * @param $owner mixed A user name or number.
- * @param $recursive bool (optional) If set True changes file owner recursivly. Defaults to False.
</del><ins>+ * @param string $file Path to the file.
+ * @param mixed $owner A user name or number.
+ * @param bool $recursive (optional) If set True changes file owner recursivly. Defaults to False.
</ins><span class="cx"> * @return bool Returns true on success or false on failure.
</span><span class="cx"> */
</span><span class="cx"> function chown($file, $owner, $recursive = false) {
</span><span class="lines">@@ -160,7 +160,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Gets file owner
</span><span class="cx"> *
</span><del>- * @param $file string Path to the file.
</del><ins>+ * @param string $file Path to the file.
</ins><span class="cx"> * @return string Username of the user.
</span><span class="cx"> */
</span><span class="cx"> function owner($file) {
</span><span class="lines">@@ -177,7 +177,7 @@
</span><span class="cx"> *
</span><span class="cx"> * FIXME does not handle errors in fileperms()
</span><span class="cx"> *
</span><del>- * @param $file string Path to the file.
</del><ins>+ * @param string $file Path to the file.
</ins><span class="cx"> * @return string Mode of the file (last 4 digits).
</span><span class="cx"> */
</span><span class="cx"> function getchmod($file) {
</span></span></pre></div>
<a id="trunkwpadminincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/media.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/media.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-admin/includes/media.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -835,7 +835,7 @@
</span><span class="cx"> * @since unknown
</span><span class="cx"> *
</span><span class="cx"> * @param unknown_type $post
</span><del>- * @param unknown_type $checked
</del><ins>+ * @param unknown_type $check
</ins><span class="cx"> * @return unknown
</span><span class="cx"> */
</span><span class="cx"> function image_size_input_fields( $post, $check = '' ) {
</span></span></pre></div>
<a id="trunkwpadminincludesmetaboxesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/meta-boxes.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/meta-boxes.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-admin/includes/meta-boxes.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -433,8 +433,8 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> *
</span><del>- * @param $result table header rows
- * @return
</del><ins>+ * @param array $result table header rows
+ * @return array
</ins><span class="cx"> */
</span><span class="cx"> function post_comment_meta_box_thead($result) {
</span><span class="cx"> unset($result['cb'], $result['response']);
</span></span></pre></div>
<a id="trunkwpadminincludesmsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/ms.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/ms.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-admin/includes/ms.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -712,7 +712,7 @@
</span><span class="cx"> * Grants super admin privileges.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><del>- * @param $user_id
</del><ins>+ * @param int $user_id
</ins><span class="cx"> */
</span><span class="cx"> function grant_super_admin( $user_id ) {
</span><span class="cx"> global $super_admins;
</span><span class="lines">@@ -740,7 +740,7 @@
</span><span class="cx"> * Revokes super admin privileges.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><del>- * @param $user_id
</del><ins>+ * @param int $user_id
</ins><span class="cx"> */
</span><span class="cx"> function revoke_super_admin( $user_id ) {
</span><span class="cx"> global $super_admins;
</span></span></pre></div>
<a id="trunkwpadminincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/plugin.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/plugin.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-admin/includes/plugin.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -428,8 +428,8 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> *
</span><del>- * @param $file Plugin to check
- * $return bool True if plugin is network only, false otherwise.
</del><ins>+ * @param string $plugin Plugin to check
+ * @return bool True if plugin is network only, false otherwise.
</ins><span class="cx"> */
</span><span class="cx"> function is_network_only_plugin( $plugin ) {
</span><span class="cx"> $plugin_data = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin );
</span></span></pre></div>
<a id="trunkwpadminincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/post.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/post.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-admin/includes/post.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -15,7 +15,7 @@
</span><span class="cx"> * @since 2.6.0
</span><span class="cx"> *
</span><span class="cx"> * @param bool $update Are we updating a pre-existing post?
</span><del>- * @param post_data array Array of post data. Defaults to the contents of $_POST.
</del><ins>+ * @param array $post_data Array of post data. Defaults to the contents of $_POST.
</ins><span class="cx"> * @return object|bool WP_Error on failure, true on success.
</span><span class="cx"> */
</span><span class="cx"> function _wp_translate_postdata( $update = false, $post_data = null ) {
</span><span class="lines">@@ -353,7 +353,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since unknown
</span><span class="cx"> *
</span><del>- *@param string A post type string, defaults to 'post'.
</del><ins>+ * @param string $post_type A post type string, defaults to 'post'.
</ins><span class="cx"> * @return object stdClass object containing all the default post data as attributes
</span><span class="cx"> */
</span><span class="cx"> function get_default_post_to_edit( $post_type = 'post', $create_in_db = false ) {
</span></span></pre></div>
<a id="trunkwpadminincludestemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-admin/includes/template.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-admin/includes/template.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-admin/includes/template.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -712,14 +712,11 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Print out <option> html elements for role selectors based on $wp_roles
</del><ins>+ * Print out <option> html elements for role selectors
</ins><span class="cx"> *
</span><del>- * @package WordPress
- * @subpackage Administration
</del><span class="cx"> * @since 2.1
</span><span class="cx"> *
</span><del>- * @uses $wp_roles
- * @param string $default slug for the role that should be already selected
</del><ins>+ * @param string $selected slug for the role that should be already selected
</ins><span class="cx"> */
</span><span class="cx"> function wp_dropdown_roles( $selected = false ) {
</span><span class="cx"> $p = '';
</span><span class="lines">@@ -729,7 +726,7 @@
</span><span class="cx">
</span><span class="cx"> foreach ( $editable_roles as $role => $details ) {
</span><span class="cx"> $name = translate_user_role($details['name'] );
</span><del>- if ( $selected == $role ) // Make default first in list
</del><ins>+ if ( $selected == $role ) // preselect specified role
</ins><span class="cx"> $p = "\n\t<option selected='selected' value='" . esc_attr($role) . "'>$name</option>";
</span><span class="cx"> else
</span><span class="cx"> $r .= "\n\t<option value='" . esc_attr($role) . "'>$name</option>";
</span><span class="lines">@@ -1268,9 +1265,8 @@
</span><span class="cx"> * @param string $setting Optional slug title of a specific setting who's errors you want.
</span><span class="cx"> * @param boolean $sanitize Whether to re-sanitize the setting value before returning errors.
</span><span class="cx"> * @param boolean $hide_on_update If set to true errors will not be shown if the settings page has already been submitted.
</span><del>- * @return <type>
</del><span class="cx"> */
</span><del>-function settings_errors ( $setting = '', $sanitize = FALSE, $hide_on_update = FALSE ) {
</del><ins>+function settings_errors( $setting = '', $sanitize = FALSE, $hide_on_update = FALSE ) {
</ins><span class="cx">
</span><span class="cx"> if ($hide_on_update AND $_GET['updated']) return;
</span><span class="cx">
</span><span class="lines">@@ -1493,10 +1489,10 @@
</span><span class="cx"> * returned.
</span><span class="cx"> *
</span><span class="cx"> * @since 2.7.0
</span><del>- * @param int $id The post id. If not supplied the global $post is used.
- *
</del><ins>+ * @param int $post_id The post id. If not supplied the global $post is used.
+ * @return string The post title if set
</ins><span class="cx"> */
</span><del>-function _draft_or_post_title($post_id = 0) {
</del><ins>+function _draft_or_post_title( $post_id = 0 ) {
</ins><span class="cx"> $title = get_the_title($post_id);
</span><span class="cx"> if ( empty($title) )
</span><span class="cx"> $title = __('(no title)');
</span></span></pre></div>
<a id="trunkwpincludesbookmarkphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/bookmark.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/bookmark.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-includes/bookmark.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -7,12 +7,12 @@
</span><span class="cx"> */
</span><span class="cx">
</span><span class="cx"> /**
</span><del>- * Retrieve Bookmark data based on ID
</del><ins>+ * Retrieve Bookmark data
</ins><span class="cx"> *
</span><span class="cx"> * @since 2.1.0
</span><span class="cx"> * @uses $wpdb Database Object
</span><span class="cx"> *
</span><del>- * @param int $bookmark_id
</del><ins>+ * @param mixed $bookmark
</ins><span class="cx"> * @param string $output Optional. Either OBJECT, ARRAY_N, or ARRAY_A constant
</span><span class="cx"> * @param string $filter Optional, default is 'raw'.
</span><span class="cx"> * @return array|object Type returned depends on $output value.
</span></span></pre></div>
<a id="trunkwpincludescachephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/cache.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/cache.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-includes/cache.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -110,7 +110,7 @@
</span><span class="cx"> * @uses $wp_object_cache Object Cache Class
</span><span class="cx"> * @see WP_Object_Cache::replace()
</span><span class="cx"> *
</span><del>- * @param int|string $id What to call the contents in the cache
</del><ins>+ * @param int|string $key What to call the contents in the cache
</ins><span class="cx"> * @param mixed $data The contents to store in the cache
</span><span class="cx"> * @param string $flag Where to group the cache contents
</span><span class="cx"> * @param int $expire When to expire the cache contents
</span><span class="lines">@@ -129,7 +129,7 @@
</span><span class="cx"> * @uses $wp_object_cache Object Cache Class
</span><span class="cx"> * @see WP_Object_Cache::set()
</span><span class="cx"> *
</span><del>- * @param int|string $id What to call the contents in the cache
</del><ins>+ * @param int|string $key What to call the contents in the cache
</ins><span class="cx"> * @param mixed $data The contents to store in the cache
</span><span class="cx"> * @param string $flag Where to group the cache contents
</span><span class="cx"> * @param int $expire When to expire the cache contents
</span></span></pre></div>
<a id="trunkwpincludescategorytemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/category-template.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/category-template.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-includes/category-template.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -250,8 +250,8 @@
</span><span class="cx"> *
</span><span class="cx"> * @uses is_object_in_term()
</span><span class="cx"> *
</span><del>- * @param int|string|array $category. Category ID, name or slug, or array of said.
- * @param int|post object Optional. Post to check instead of the current post. @since 2.7.0
</del><ins>+ * @param int|string|array $category Category ID, name or slug, or array of said.
+ * @param int|object $_post Optional. Post to check instead of the current post. (since 2.7.0)
</ins><span class="cx"> * @return bool True if the current post is in any of the given categories.
</span><span class="cx"> */
</span><span class="cx"> function in_category( $category, $_post = null ) {
</span><span class="lines">@@ -987,7 +987,7 @@
</span><span class="cx"> * @uses is_object_in_term()
</span><span class="cx"> *
</span><span class="cx"> * @param string|int|array $tag Optional. The tag name/term_id/slug or array of them to check for.
</span><del>- * @param int|post object Optional. Post to check instead of the current post. @since 2.7.0
</del><ins>+ * @param int|object $_post Optional. Post to check instead of the current post. (since 2.7.0)
</ins><span class="cx"> * @return bool True if the current post has any of the the given tags (or any tag, if no tag specified).
</span><span class="cx"> */
</span><span class="cx"> function has_tag( $tag = '', $_post = null ) {
</span></span></pre></div>
<a id="trunkwpincludesclassesphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/classes.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/classes.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-includes/classes.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -980,8 +980,8 @@
</span><span class="cx"> *
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @since 2.7
</span><del>- * @param $max_depth = 0 means display all levels; $max_depth > 0 specifies the number of display levels.
- * @param $page_num the specific page number, beginning with 1.
</del><ins>+ * @param int $max_depth = 0 means display all levels; $max_depth > 0 specifies the number of display levels.
+ * @param int $page_num the specific page number, beginning with 1.
</ins><span class="cx"> * @return XHTML of the specified page of elements
</span><span class="cx"> */
</span><span class="cx"> function paged_walk( $elements, $max_depth, $page_num, $per_page ) {
</span></span></pre></div>
<a id="trunkwpincludescommenttemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment-template.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment-template.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-includes/comment-template.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> * @since 0.71
</span><span class="cx"> * @see get_comment_author_link() Echoes result
</span><span class="cx"> *
</span><del>- * @param int The ID of the comment for which to print the author's link. Optional.
</del><ins>+ * @param int $comment_ID The ID of the comment for which to print the author's link. Optional.
</ins><span class="cx"> */
</span><span class="cx"> function comment_author_link( $comment_ID = 0 ) {
</span><span class="cx"> echo get_comment_author_link( $comment_ID );
</span></span></pre></div>
<a id="trunkwpincludescommentphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/comment.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/comment.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-includes/comment.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -439,8 +439,8 @@
</span><span class="cx"> * @link http://codex.wordpress.org/Function_Reference/add_comment_meta
</span><span class="cx"> *
</span><span class="cx"> * @param int $comment_id Comment ID.
</span><del>- * @param string $key Metadata name.
- * @param mixed $value Metadata value.
</del><ins>+ * @param string $meta_key Metadata name.
+ * @param mixed $meta_value Metadata value.
</ins><span class="cx"> * @param bool $unique Optional, default is false. Whether the same key should not be added.
</span><span class="cx"> * @return bool False for failure. True for success.
</span><span class="cx"> */
</span><span class="lines">@@ -498,8 +498,8 @@
</span><span class="cx"> * @link http://codex.wordpress.org/Function_Reference/update_comment_meta
</span><span class="cx"> *
</span><span class="cx"> * @param int $comment_id Comment ID.
</span><del>- * @param string $key Metadata key.
- * @param mixed $value Metadata value.
</del><ins>+ * @param string $meta_key Metadata key.
+ * @param mixed $meta_value Metadata value.
</ins><span class="cx"> * @param mixed $prev_value Optional. Previous value to check before removing.
</span><span class="cx"> * @return bool False on failure, true if success.
</span><span class="cx"> */
</span><span class="lines">@@ -1858,7 +1858,7 @@
</span><span class="cx"> * @package WordPress
</span><span class="cx"> * @subpackage Cache
</span><span class="cx"> *
</span><del>- * @param int|array $id Comment ID or array of comment IDs to remove from cache
</del><ins>+ * @param int|array $ids Comment ID or array of comment IDs to remove from cache
</ins><span class="cx"> */
</span><span class="cx"> function clean_comment_cache($ids) {
</span><span class="cx"> foreach ( (array) $ids as $id )
</span></span></pre></div>
<a id="trunkwpincludesdeprecatedphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/deprecated.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/deprecated.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-includes/deprecated.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -164,10 +164,10 @@
</span><span class="cx"> * @see next_post_link()
</span><span class="cx"> *
</span><span class="cx"> * @param string $format
</span><del>- * @param string $previous
</del><ins>+ * @param string $next
</ins><span class="cx"> * @param string $title
</span><span class="cx"> * @param string $in_same_cat
</span><del>- * @param int $limitprev
</del><ins>+ * @param int $limitnext
</ins><span class="cx"> * @param string $excluded_categories
</span><span class="cx"> */
</span><span class="cx"> function next_post($format='%', $next='next post: ', $title='yes', $in_same_cat='no', $limitnext=1, $excluded_categories='') {
</span><span class="lines">@@ -872,7 +872,7 @@
</span><span class="cx"> * @deprecated Use the_permalink_rss()
</span><span class="cx"> * @see the_permalink_rss()
</span><span class="cx"> *
</span><del>- * @param string $file
</del><ins>+ * @param string $deprecated
</ins><span class="cx"> */
</span><span class="cx"> function permalink_single_rss($deprecated = '') {
</span><span class="cx"> _deprecated_function( __FUNCTION__, '2.3', 'the_permalink_rss()' );
</span></span></pre></div>
<a id="trunkwpincludesformattingphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/formatting.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/formatting.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-includes/formatting.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -1474,7 +1474,7 @@
</span><span class="cx"> * @since 0.71
</span><span class="cx"> *
</span><span class="cx"> * @param string $email Email address to verify.
</span><del>- * @param boolean $deprecated. Deprecated.
</del><ins>+ * @param boolean $deprecated Deprecated.
</ins><span class="cx"> * @return string|bool Either false or the valid email address.
</span><span class="cx"> */
</span><span class="cx"> function is_email( $email, $deprecated = false ) {
</span></span></pre></div>
<a id="trunkwpincludesfunctionsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-includes/functions.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -4177,7 +4177,7 @@
</span><span class="cx"> * @since 2.9.0
</span><span class="cx"> *
</span><span class="cx"> * @param string $file Path to the file
</span><del>- * @param bool $markup If the returned data should have HTML markup applied
</del><ins>+ * @param array $default_headers Default metadata headers
</ins><span class="cx"> * @param string $context If specified adds filter hook "extra_<$context>_headers"
</span><span class="cx"> */
</span><span class="cx"> function get_file_data( $file, $default_headers, $context = '' ) {
</span></span></pre></div>
<a id="trunkwpincludesfunctionswpscriptsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/functions.wp-scripts.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/functions.wp-scripts.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-includes/functions.wp-scripts.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -42,7 +42,7 @@
</span><span class="cx"> * @param string $src Script url
</span><span class="cx"> * @param array $deps (optional) Array of script names on which this script depends
</span><span class="cx"> * @param string|bool $ver (optional) Script version (used for cache busting), set to NULL to disable
</span><del>- * @param bool (optional) Wether to enqueue the script before </head> or before </body>
</del><ins>+ * @param bool $in_footer (optional) Whether to enqueue the script before </head> or before </body>
</ins><span class="cx"> * @return null
</span><span class="cx"> */
</span><span class="cx"> function wp_register_script( $handle, $src, $deps = array(), $ver = false, $in_footer = false ) {
</span></span></pre></div>
<a id="trunkwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/general-template.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/general-template.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-includes/general-template.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -2037,7 +2037,7 @@
</span><span class="cx"> * @param string $key The unique key for this theme.
</span><span class="cx"> * @param string $name The name of the theme.
</span><span class="cx"> * @param string $url The url of the css file containing the colour scheme.
</span><del>- * @param array @colors Optional An array of CSS color definitions which are used to give the user a feel for the theme.
</del><ins>+ * @param array $colors Optional An array of CSS color definitions which are used to give the user a feel for the theme.
</ins><span class="cx"> */
</span><span class="cx"> function wp_admin_css_color($key, $name, $url, $colors = array()) {
</span><span class="cx"> global $_wp_admin_css_colors;
</span><span class="lines">@@ -2246,7 +2246,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 1.0
</span><span class="cx"> *
</span><del>- * @param mixed selected One of the values to compare
</del><ins>+ * @param mixed $selected One of the values to compare
</ins><span class="cx"> * @param mixed $current (true) The other value to compare if not just true
</span><span class="cx"> * @param bool $echo Whether to echo or just return the string
</span><span class="cx"> * @return string html attribute or empty string
</span></span></pre></div>
<a id="trunkwpincludesl10nphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/l10n.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/l10n.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-includes/l10n.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -270,8 +270,8 @@
</span><span class="cx"> * $usable_text = sprintf(_n($message[0], $message[1], $count), $count);
</span><span class="cx"> *
</span><span class="cx"> * @since 2.5
</span><del>- * @param $single Single form to be i18ned
- * @param $plural Plural form to be i18ned
</del><ins>+ * @param string $single Single form to be i18ned
+ * @param string $plural Plural form to be i18ned
</ins><span class="cx"> * @return array array($single, $plural)
</span><span class="cx"> */
</span><span class="cx"> function _n_noop( $single, $plural ) {
</span></span></pre></div>
<a id="trunkwpincludeslinktemplatephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/link-template.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/link-template.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-includes/link-template.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -27,8 +27,8 @@
</span><span class="cx"> * @since 2.2.0
</span><span class="cx"> * @uses $wp_rewrite
</span><span class="cx"> *
</span><del>- * @param $string String a URL with or without a trailing slash.
- * @param $type_of_url String the type of URL being considered (e.g. single, category, etc) for use in the filter.
</del><ins>+ * @param string $string URL with or without a trailing slash.
+ * @param string $type_of_url The type of URL being considered (e.g. single, category, etc) for use in the filter.
</ins><span class="cx"> * @return string
</span><span class="cx"> */
</span><span class="cx"> function user_trailingslashit($string, $type_of_url = '') {
</span><span class="lines">@@ -1154,7 +1154,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param bool $in_same_cat Optional. Whether returned post should be in same category.
</span><span class="cx"> * @param string $excluded_categories Optional. Excluded categories IDs.
</span><del>- * @param bool $previous Optional. Whether to retrieve first post.
</del><ins>+ * @param bool $start Optional. Whether to retrieve first or last post.
</ins><span class="cx"> * @return object
</span><span class="cx"> */
</span><span class="cx"> function get_boundary_post($in_same_cat = false, $excluded_categories = '', $start = true) {
</span><span class="lines">@@ -1200,7 +1200,7 @@
</span><span class="cx"> * @param string $title Optional. Link title format.
</span><span class="cx"> * @param bool $in_same_cat Optional. Whether link should be in same category.
</span><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 post.
</del><ins>+ * @param bool $start Optional, default is true. Whether 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">@@ -2186,7 +2186,7 @@
</span><span class="cx"> * @since 3.0.0.
</span><span class="cx"> *
</span><span class="cx"> * @param int $id A post or blog id. Default is 0, which means the current post or blog.
</span><del>- * @param string $contex 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'.
</del><ins>+ * @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'.
</ins><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="cx"> */
</span></span></pre></div>
<a id="trunkwpincludesmediaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/media.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/media.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-includes/media.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -960,7 +960,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.9.0
</span><span class="cx"> *
</span><del>- * @param $mime_type string
</del><ins>+ * @param string $mime_type
</ins><span class="cx"> * @return bool
</span><span class="cx"> */
</span><span class="cx"> function gd_edit_image_support($mime_type) {
</span><span class="lines">@@ -991,8 +991,8 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.9.0
</span><span class="cx"> *
</span><del>- * @param $width
- * @param $height
</del><ins>+ * @param int $width Image width
+ * @param int $height Image height
</ins><span class="cx"> * @return image resource
</span><span class="cx"> */
</span><span class="cx"> function wp_imagecreatetruecolor($width, $height) {
</span></span></pre></div>
<a id="trunkwpincludesmetaphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/meta.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/meta.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-includes/meta.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -328,7 +328,7 @@
</span><span class="cx"> * @since 2.9.0
</span><span class="cx"> * @uses $wpdb WordPress database object for queries.
</span><span class="cx"> *
</span><del>- * @param string $meta_type Type of object to get metadata table for (e.g., comment, post, or user)
</del><ins>+ * @param string $type Type of object to get metadata table for (e.g., comment, post, or user)
</ins><span class="cx"> * @return mixed Metadata table name, or false if no metadata table exists
</span><span class="cx"> */
</span><span class="cx"> function _get_meta_table($type) {
</span></span></pre></div>
<a id="trunkwpincludesnavmenuphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/nav-menu.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/nav-menu.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-includes/nav-menu.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -403,7 +403,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> *
</span><del>- * @param $args array Array of arguments passed on to get_terms().
</del><ins>+ * @param array $args Array of arguments passed on to get_terms().
</ins><span class="cx"> * @return array menu objects
</span><span class="cx"> */
</span><span class="cx"> function wp_get_nav_menus( $args = array() ) {
</span></span></pre></div>
<a id="trunkwpincludespluginphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/plugin.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/plugin.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-includes/plugin.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -727,7 +727,6 @@
</span><span class="cx"> * @param string $tag Used in counting how many hooks were applied
</span><span class="cx"> * @param callback $function Used for creating unique id
</span><span class="cx"> * @param int|bool $priority Used in counting how many hooks were applied. If === false and $function is an object reference, we return the unique id only if it already has one, false otherwise.
</span><del>- * @param string $type filter or action
</del><span class="cx"> * @return string|bool Unique ID for usage as array key or false if $priority === false and $function is an object reference, and it does not already have a uniqe id.
</span><span class="cx"> */
</span><span class="cx"> function _wp_filter_build_unique_id($tag, $function, $priority) {
</span></span></pre></div>
<a id="trunkwpincludespomostreamsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/pomo/streams.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/pomo/streams.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-includes/pomo/streams.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -22,7 +22,7 @@
</span><span class="cx"> /**
</span><span class="cx"> * Sets the endianness of the file.
</span><span class="cx"> *
</span><del>- * @param $endian string 'big' or 'little'
</del><ins>+ * @param string $endian 'big' or 'little'
</ins><span class="cx"> */
</span><span class="cx"> function setEndian($endian) {
</span><span class="cx"> $this->endian = $endian;
</span></span></pre></div>
<a id="trunkwpincludespostphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/post.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/post.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-includes/post.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -625,7 +625,7 @@
</span><span class="cx"> * @see register_post_status
</span><span class="cx"> * @see get_post_statuses
</span><span class="cx"> *
</span><del>- * @param string $post_type The name of a registered post status
</del><ins>+ * @param string $post_status The name of a registered post status
</ins><span class="cx"> * @return object A post status object
</span><span class="cx"> */
</span><span class="cx"> function get_post_status_object( $post_status ) {
</span><span class="lines">@@ -669,7 +669,7 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> * @see get_post_type_object
</span><span class="cx"> *
</span><del>- * @param string $post Post type name
</del><ins>+ * @param string $post_type Post type name
</ins><span class="cx"> * @return bool Whether post type is hierarchical.
</span><span class="cx"> */
</span><span class="cx"> function is_post_type_hierarchical( $post_type ) {
</span><span class="lines">@@ -686,7 +686,7 @@
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> * @uses get_post_type_object()
</span><span class="cx"> *
</span><del>- * @param string Post type name
</del><ins>+ * @param string $post_type Post type name
</ins><span class="cx"> * @return bool Whether post type is registered.
</span><span class="cx"> */
</span><span class="cx"> function post_type_exists( $post_type ) {
</span><span class="lines">@@ -1144,8 +1144,8 @@
</span><span class="cx"> * @link http://codex.wordpress.org/Function_Reference/add_post_meta
</span><span class="cx"> *
</span><span class="cx"> * @param int $post_id Post ID.
</span><del>- * @param string $key Metadata name.
- * @param mixed $value Metadata value.
</del><ins>+ * @param string $meta_key Metadata name.
+ * @param mixed $meta_value Metadata value.
</ins><span class="cx"> * @param bool $unique Optional, default is false. Whether the same key should not be added.
</span><span class="cx"> * @return bool False for failure. True for success.
</span><span class="cx"> */
</span><span class="lines">@@ -1211,8 +1211,8 @@
</span><span class="cx"> * @link http://codex.wordpress.org/Function_Reference/update_post_meta
</span><span class="cx"> *
</span><span class="cx"> * @param int $post_id Post ID.
</span><del>- * @param string $key Metadata key.
- * @param mixed $value Metadata value.
</del><ins>+ * @param string $meta_key Metadata key.
+ * @param mixed $meta_value Metadata value.
</ins><span class="cx"> * @param mixed $prev_value Optional. Previous value to check before removing.
</span><span class="cx"> * @return bool False on failure, true if success.
</span><span class="cx"> */
</span><span class="lines">@@ -1650,7 +1650,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.5.0
</span><span class="cx"> *
</span><del>- * @param string|array $mime_types List of mime types or comma separated string of mime types.
</del><ins>+ * @param string|array $post_mime_types List of mime types or comma separated string of mime types.
</ins><span class="cx"> * @param string $table_alias Optional. Specify a table alias, if needed.
</span><span class="cx"> * @return string The SQL AND clause for mime searching.
</span><span class="cx"> */
</span><span class="lines">@@ -1809,7 +1809,7 @@
</span><span class="cx"> * @uses do_action() on 'trashed_post' after trashing
</span><span class="cx"> * @uses wp_delete_post() if trash is disabled
</span><span class="cx"> *
</span><del>- * @param int $postid Post ID.
</del><ins>+ * @param int $post_id Post ID.
</ins><span class="cx"> * @return mixed False on failure
</span><span class="cx"> */
</span><span class="cx"> function wp_trash_post($post_id = 0) {
</span><span class="lines">@@ -1844,7 +1844,7 @@
</span><span class="cx"> * @uses do_action() on 'untrash_post' before undeletion
</span><span class="cx"> * @uses do_action() on 'untrashed_post' after undeletion
</span><span class="cx"> *
</span><del>- * @param int $postid Post ID.
</del><ins>+ * @param int $post_id Post ID.
</ins><span class="cx"> * @return mixed False on failure
</span><span class="cx"> */
</span><span class="cx"> function wp_untrash_post($post_id = 0) {
</span><span class="lines">@@ -2964,12 +2964,11 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.0.0
</span><span class="cx"> *
</span><del>- * @param array $posts Posts array.
- * @param int $parent Parent page ID.
</del><ins>+ * @param array $pages Posts array.
+ * @param int $page_id Parent page ID.
</ins><span class="cx"> * @return array A list arranged by hierarchy. Children immediately follow their parents.
</span><span class="cx"> */
</span><span class="cx"> function &get_page_hierarchy( &$pages, $page_id = 0 ) {
</span><del>-
</del><span class="cx"> if ( empty( $pages ) ) {
</span><span class="cx"> $result = array();
</span><span class="cx"> return $result;
</span><span class="lines">@@ -2977,13 +2976,12 @@
</span><span class="cx">
</span><span class="cx"> $children = array();
</span><span class="cx"> foreach ( (array) $pages as $p ) {
</span><del>-
</del><span class="cx"> $parent_id = intval( $p->post_parent );
</span><span class="cx"> $children[ $parent_id ][] = $p;
</span><del>- }
</del><ins>+ }
</ins><span class="cx">
</span><del>- $result = array();
- _page_traverse_name( $page_id, $children, $result );
</del><ins>+ $result = array();
+ _page_traverse_name( $page_id, $children, $result );
</ins><span class="cx">
</span><span class="cx"> return $result;
</span><span class="cx"> }
</span><span class="lines">@@ -2994,11 +2992,8 @@
</span><span class="cx"> *
</span><span class="cx"> */
</span><span class="cx"> function _page_traverse_name( $page_id, &$children, &$result ){
</span><del>-
</del><span class="cx"> if ( isset( $children[ $page_id ] ) ){
</span><del>-
</del><span class="cx"> foreach( (array)$children[ $page_id ] as $child ) {
</span><del>-
</del><span class="cx"> $result[ $child->ID ] = $child->post_name;
</span><span class="cx"> _page_traverse_name( $child->ID, $children, $result );
</span><span class="cx"> }
</span><span class="lines">@@ -3277,7 +3272,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @param string|array $object Arguments to override defaults.
</span><span class="cx"> * @param string $file Optional filename.
</span><del>- * @param int $post_parent Parent post ID.
</del><ins>+ * @param int $parent Parent post ID.
</ins><span class="cx"> * @return int Attachment ID.
</span><span class="cx"> */
</span><span class="cx"> function wp_insert_attachment($object, $file = false, $parent = 0) {
</span><span class="lines">@@ -3427,7 +3422,7 @@
</span><span class="cx"> * @uses $wpdb
</span><span class="cx"> * @uses do_action() Calls 'delete_attachment' hook on Attachment ID.
</span><span class="cx"> *
</span><del>- * @param int $postid Attachment ID.
</del><ins>+ * @param int $post_id Attachment ID.
</ins><span class="cx"> * @param bool $force_delete Whether to bypass trash and force deletion. Defaults to false.
</span><span class="cx"> * @return mixed False on failure. Post data on success.
</span><span class="cx"> */
</span><span class="lines">@@ -4645,8 +4640,7 @@
</span><span class="cx"> * @uses wp_delete_post()
</span><span class="cx"> *
</span><span class="cx"> * @param int|object $revision_id Revision ID or revision object.
</span><del>- * @param array $fields Optional. What fields to restore from. Defaults to all.
- * @return mixed Null if error, false if no fields to restore, (int) post ID if success.
</del><ins>+ * @return mixed Null or WP_Error if error, deleted post if success.
</ins><span class="cx"> */
</span><span class="cx"> function wp_delete_post_revision( $revision_id ) {
</span><span class="cx"> if ( !$revision = wp_get_post_revision( $revision_id ) )
</span></span></pre></div>
<a id="trunkwpincludesqueryphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/query.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/query.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-includes/query.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -201,7 +201,7 @@
</span><span class="cx"> * @uses $wp_query
</span><span class="cx"> *
</span><span class="cx"> * @param mixed $taxonomy Optional. Taxonomy slug or slugs.
</span><del>- * @param mixed $term. Optional. Term ID, name, slug or array of Term IDs, names, and slugs.
</del><ins>+ * @param mixed $term Optional. Term ID, name, slug or array of Term IDs, names, and slugs.
</ins><span class="cx"> * @return bool
</span><span class="cx"> */
</span><span class="cx"> function is_tax( $taxonomy = '', $term = '' ) {
</span></span></pre></div>
<a id="trunkwpincludesrewritephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/rewrite.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/rewrite.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-includes/rewrite.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -1950,7 +1950,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.0.1
</span><span class="cx"> * @access public
</span><del>- * @param $hard bool Whether to update .htaccess (hard flush) or just update rewrite_rules option (soft flush). Default is true (hard).
</del><ins>+ * @param bool $hard Whether to update .htaccess (hard flush) or just update rewrite_rules option (soft flush). Default is true (hard).
</ins><span class="cx"> */
</span><span class="cx"> function flush_rules($hard = true) {
</span><span class="cx"> delete_option('rewrite_rules');
</span></span></pre></div>
<a id="trunkwpincludestaxonomyphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/taxonomy.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/taxonomy.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-includes/taxonomy.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -640,7 +640,7 @@
</span><span class="cx"> * @uses _get_term_hierarchy()
</span><span class="cx"> * @uses get_term_children() Used to get the children of both $taxonomy and the parent $term
</span><span class="cx"> *
</span><del>- * @param string $term ID of Term to get children
</del><ins>+ * @param string $term_id ID of Term to get children
</ins><span class="cx"> * @param string $taxonomy Taxonomy Name
</span><span class="cx"> * @return array|WP_Error List of Term Objects. WP_Error returned if $taxonomy does not exist
</span><span class="cx"> */
</span><span class="lines">@@ -815,7 +815,7 @@
</span><span class="cx"> * @uses $wpdb
</span><span class="cx"> * @uses wp_parse_args() Merges the defaults with those defined by $args and allows for strings.
</span><span class="cx"> *
</span><del>- * @param string|array Taxonomy name or list of Taxonomy names
</del><ins>+ * @param string|array $taxonomies Taxonomy name or list of Taxonomy names
</ins><span class="cx"> * @param string|array $args The values of what to search for when returning terms
</span><span class="cx"> * @return array|WP_Error List of Term Objects and their children. Will return WP_Error, if any of $taxonomies do not exist.
</span><span class="cx"> */
</span><span class="lines">@@ -1306,7 +1306,7 @@
</span><span class="cx"> * @uses $wpdb
</span><span class="cx"> *
</span><span class="cx"> * @param int $object_id The term Object Id that refers to the term
</span><del>- * @param string|array $taxonomy List of Taxonomy Names or single Taxonomy name.
</del><ins>+ * @param string|array $taxonomies List of Taxonomy Names or single Taxonomy name.
</ins><span class="cx"> */
</span><span class="cx"> function wp_delete_object_term_relationships( $object_id, $taxonomies ) {
</span><span class="cx"> global $wpdb;
</span><span class="lines">@@ -1444,7 +1444,7 @@
</span><span class="cx"> * @since 2.3.0
</span><span class="cx"> * @uses $wpdb
</span><span class="cx"> *
</span><del>- * @param int|array $object_id The id of the object(s) to retrieve.
</del><ins>+ * @param int|array $object_ids The ID(s) of the object(s) to retrieve.
</ins><span class="cx"> * @param string|array $taxonomies The taxonomies to retrieve terms from.
</span><span class="cx"> * @param array|string $args Change what is returned
</span><span class="cx"> * @return array|WP_Error The requested term data or empty array if no terms found. WP_Error if $taxonomy does not exist.
</span><span class="lines">@@ -1714,7 +1714,7 @@
</span><span class="cx"> * @uses $wpdb
</span><span class="cx"> *
</span><span class="cx"> * @param int $object_id The object to relate to.
</span><del>- * @param array|int|string $term The slug or id of the term, will replace all existing
</del><ins>+ * @param array|int|string $terms The slug or id of the term, will replace all existing
</ins><span class="cx"> * related terms in this taxonomy.
</span><span class="cx"> * @param array|string $taxonomy The context in which to relate the term to the object.
</span><span class="cx"> * @param bool $append If false will delete difference of terms.
</span><span class="lines">@@ -2633,8 +2633,8 @@
</span><span class="cx"> * @uses get_object_term_cache()
</span><span class="cx"> * @uses wp_get_object_terms()
</span><span class="cx"> *
</span><del>- * @param int $object_id. ID of the object (post ID, link ID, ...)
- * @param string $taxonomy. Single taxonomy name
</del><ins>+ * @param int $object_id ID of the object (post ID, link ID, ...)
+ * @param string $taxonomy Single taxonomy name
</ins><span class="cx"> * @param int|string|array $terms Optional. Term term_id, name, slug or array of said
</span><span class="cx"> * @return bool|WP_Error. WP_Error on input error.
</span><span class="cx"> */
</span><span class="lines">@@ -2679,7 +2679,7 @@
</span><span class="cx"> * @uses get_object_taxonomies()
</span><span class="cx"> *
</span><span class="cx"> * @param string $object_type Object type string
</span><del>- * @param string $taxonomy. Single taxonomy name
</del><ins>+ * @param string $taxonomy Single taxonomy name
</ins><span class="cx"> * @return bool True if object is associated with the taxonomy, otherwise false.
</span><span class="cx"> */
</span><span class="cx"> function is_object_in_taxonomy($object_type, $taxonomy) {
</span></span></pre></div>
<a id="trunkwpincludesthemephp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/theme.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/theme.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-includes/theme.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -645,9 +645,9 @@
</span><span class="cx"> * Does not have trailing slash.
</span><span class="cx"> *
</span><span class="cx"> * @since 1.5.0
</span><del>- * @param $stylesheet_or_template The stylesheet or template name of the theme
</del><span class="cx"> * @uses apply_filters() Calls 'theme_root' filter on path.
</span><span class="cx"> *
</span><ins>+ * @param string $stylesheet_or_template The stylesheet or template name of the theme
</ins><span class="cx"> * @return string Theme path.
</span><span class="cx"> */
</span><span class="cx"> function get_theme_root( $stylesheet_or_template = false ) {
</span><span class="lines">@@ -671,8 +671,8 @@
</span><span class="cx"> * Does not have trailing slash.
</span><span class="cx"> *
</span><span class="cx"> * @since 1.5.0
</span><del>- * @param $stylesheet_or_template The stylesheet or template name of the theme
</del><span class="cx"> *
</span><ins>+ * @param string $stylesheet_or_template The stylesheet or template name of the theme
</ins><span class="cx"> * @return string Themes URI.
</span><span class="cx"> */
</span><span class="cx"> function get_theme_root_uri( $stylesheet_or_template = false ) {
</span><span class="lines">@@ -1432,7 +1432,7 @@
</span><span class="cx"> * @see register_default_headers()
</span><span class="cx"> * @since 3.0.0
</span><span class="cx"> *
</span><del>- * @param string|array The header string id (key of array) to remove, or an array thereof.
</del><ins>+ * @param string|array $header The header string id (key of array) to remove, or an array thereof.
</ins><span class="cx"> * @return True on success, false on failure.
</span><span class="cx"> */
</span><span class="cx"> function unregister_default_headers( $header ) {
</span></span></pre></div>
<a id="trunkwpincludesuserphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/user.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/user.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-includes/user.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -162,7 +162,7 @@
</span><span class="cx"> * Number of posts written by a list of users.
</span><span class="cx"> *
</span><span class="cx"> * @since 3.0.0
</span><del>- * @param array $userid User ID number list.
</del><ins>+ * @param array $users User ID number list.
</ins><span class="cx"> * @return array Amount of posts each user has written.
</span><span class="cx"> */
</span><span class="cx"> function count_many_users_posts($users) {
</span><span class="lines">@@ -584,8 +584,8 @@
</span><span class="cx"> * @link http://codex.wordpress.org/Function_Reference/add_user_meta
</span><span class="cx"> *
</span><span class="cx"> * @param int $user_id Post ID.
</span><del>- * @param string $key Metadata name.
- * @param mixed $value Metadata value.
</del><ins>+ * @param string $meta_key Metadata name.
+ * @param mixed $meta_value Metadata value.
</ins><span class="cx"> * @param bool $unique Optional, default is false. Whether the same key should not be added.
</span><span class="cx"> * @return bool False for failure. True for success.
</span><span class="cx"> */
</span><span class="lines">@@ -643,8 +643,8 @@
</span><span class="cx"> * @link http://codex.wordpress.org/Function_Reference/update_user_meta
</span><span class="cx"> *
</span><span class="cx"> * @param int $user_id Post ID.
</span><del>- * @param string $key Metadata key.
- * @param mixed $value Metadata value.
</del><ins>+ * @param string $meta_key Metadata key.
+ * @param mixed $meta_value Metadata value.
</ins><span class="cx"> * @param mixed $prev_value Optional. Previous value to check before removing.
</span><span class="cx"> * @return bool False on failure, true if success.
</span><span class="cx"> */
</span></span></pre></div>
<a id="trunkwpincludeswidgetsphp"></a>
<div class="modfile"><h4>Modified: trunk/wp-includes/widgets.php (15589 => 15590)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/wp-includes/widgets.php 2010-09-07 04:46:08 UTC (rev 15589)
+++ trunk/wp-includes/widgets.php 2010-09-07 11:21:11 UTC (rev 15590)
</span><span class="lines">@@ -596,7 +596,7 @@
</span><span class="cx"> * @param int|string $id Widget ID.
</span><span class="cx"> * @param string $name Widget display title.
</span><span class="cx"> * @param callback $output_callback Run when widget is called.
</span><del>- * @param array|string Optional. $options Widget Options.
</del><ins>+ * @param array|string $options Optional. Widget Options.
</ins><span class="cx"> * @param mixed $params,... Widget parameters to add to widget.
</span><span class="cx"> * @return null Will return if $output_callback is empty after removing widget.
</span><span class="cx"> */
</span><span class="lines">@@ -911,7 +911,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.2.0
</span><span class="cx"> *
</span><del>- * @param callback Optional, Widget callback to check.
</del><ins>+ * @param string $callback Optional, Widget callback to check.
</ins><span class="cx"> * @param int $widget_id Optional, but needed for checking. Widget ID.
</span><span class="cx"> * @param string $id_base Optional, the base ID of a widget created by extending WP_Widget.
</span><span class="cx"> * @param bool $skip_inactive Optional, whether to check in 'wp_inactive_widgets'.
</span><span class="lines">@@ -965,7 +965,7 @@
</span><span class="cx"> *
</span><span class="cx"> * @since 2.8
</span><span class="cx"> *
</span><del>- * @param mixed $index, sidebar name, id or number to check.
</del><ins>+ * @param mixed $index Sidebar name, id or number to check.
</ins><span class="cx"> * @return bool true if the sidebar is in use, false otherwise.
</span><span class="cx"> */
</span><span class="cx"> function is_active_sidebar( $index ) {
</span><span class="lines">@@ -988,7 +988,7 @@
</span><span class="cx"> * @since 2.2.0
</span><span class="cx"> * @access private
</span><span class="cx"> *
</span><del>- * @param bool $deprecated. Not used.
</del><ins>+ * @param bool $deprecated Not used (deprecated).
</ins><span class="cx"> * @return array Upgraded list of widgets to version 3 array format when called from the admin.
</span><span class="cx"> */
</span><span class="cx"> function wp_get_sidebars_widgets($deprecated = true) {
</span></span></pre>
</div>
</div>
</body>
</html>