diff --git a/wp-admin/includes/class-wp-filesystem-direct.php b/wp-admin/includes/class-wp-filesystem-direct.php
index 538a683e8..94319bce0 100644
--- a/wp-admin/includes/class-wp-filesystem-direct.php
+++ b/wp-admin/includes/class-wp-filesystem-direct.php
@@ -19,7 +19,7 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
/**
* constructor
*
- * @param $arg mixed ingored argument
+ * @param mixed $arg ingored argument
*/
function WP_Filesystem_Direct($arg) {
$this->method = 'direct';
@@ -36,7 +36,7 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
/**
* Reads entire file into a string
*
- * @param $file string Name of the file to read.
+ * @param string $file Name of the file to read.
* @return string|bool The function returns the read data or false on failure.
*/
function get_contents($file) {
@@ -45,7 +45,7 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
/**
* Reads entire file into an array
*
- * @param $file string Path to the file.
+ * @param string $file Path to the file.
* @return array|bool the file contents in an array or false on failure.
*/
function get_contents_array($file) {
@@ -54,9 +54,9 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
/**
* Write a string to a file
*
- * @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.
+ * @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.
* @return bool False upon failure.
*/
function put_contents($file, $contents, $mode = false ) {
@@ -78,7 +78,7 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
/**
* Change directory
*
- * @param $dir string The new current directory.
+ * @param string $dir The new current directory.
* @return bool Returns true on success or false on failure.
*/
function chdir($dir) {
@@ -87,9 +87,9 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
/**
* Changes file group
*
- * @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.
+ * @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.
* @return bool Returns true on success or false on failure.
*/
function chgrp($file, $group, $recursive = false) {
@@ -110,9 +110,9 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
/**
* Changes filesystem permissions
*
- * @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.
+ * @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.
* @return bool Returns true on success or false on failure.
*/
function chmod($file, $mode = false, $recursive = false) {
@@ -138,9 +138,9 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
/**
* Changes file owner
*
- * @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.
+ * @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.
* @return bool Returns true on success or false on failure.
*/
function chown($file, $owner, $recursive = false) {
@@ -160,7 +160,7 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
/**
* Gets file owner
*
- * @param $file string Path to the file.
+ * @param string $file Path to the file.
* @return string Username of the user.
*/
function owner($file) {
@@ -177,7 +177,7 @@ class WP_Filesystem_Direct extends WP_Filesystem_Base {
*
* FIXME does not handle errors in fileperms()
*
- * @param $file string Path to the file.
+ * @param string $file Path to the file.
* @return string Mode of the file (last 4 digits).
*/
function getchmod($file) {
diff --git a/wp-admin/includes/media.php b/wp-admin/includes/media.php
index e5c89e071..23c3a365a 100644
--- a/wp-admin/includes/media.php
+++ b/wp-admin/includes/media.php
@@ -835,7 +835,7 @@ function image_align_input_fields( $post, $checked = '' ) {
* @since unknown
*
* @param unknown_type $post
- * @param unknown_type $checked
+ * @param unknown_type $check
* @return unknown
*/
function image_size_input_fields( $post, $check = '' ) {
diff --git a/wp-admin/includes/meta-boxes.php b/wp-admin/includes/meta-boxes.php
index d4a68a6ee..0fbbccc31 100644
--- a/wp-admin/includes/meta-boxes.php
+++ b/wp-admin/includes/meta-boxes.php
@@ -433,8 +433,8 @@ function post_comment_status_meta_box($post) {
*
* @since 3.0.0
*
- * @param $result table header rows
- * @return
+ * @param array $result table header rows
+ * @return array
*/
function post_comment_meta_box_thead($result) {
unset($result['cb'], $result['response']);
diff --git a/wp-admin/includes/ms.php b/wp-admin/includes/ms.php
index ca0a5e79d..940adfc32 100644
--- a/wp-admin/includes/ms.php
+++ b/wp-admin/includes/ms.php
@@ -712,7 +712,7 @@ add_action( 'admin_notices', 'ms_deprecated_blogs_file' );
* Grants super admin privileges.
*
* @since 3.0.0
- * @param $user_id
+ * @param int $user_id
*/
function grant_super_admin( $user_id ) {
global $super_admins;
@@ -740,7 +740,7 @@ function grant_super_admin( $user_id ) {
* Revokes super admin privileges.
*
* @since 3.0.0
- * @param $user_id
+ * @param int $user_id
*/
function revoke_super_admin( $user_id ) {
global $super_admins;
diff --git a/wp-admin/includes/plugin.php b/wp-admin/includes/plugin.php
index eab56adec..d5e17e588 100644
--- a/wp-admin/includes/plugin.php
+++ b/wp-admin/includes/plugin.php
@@ -428,8 +428,8 @@ function is_plugin_active_for_network( $plugin ) {
*
* @since 3.0.0
*
- * @param $file Plugin to check
- * $return bool True if plugin is network only, false otherwise.
+ * @param string $plugin Plugin to check
+ * @return bool True if plugin is network only, false otherwise.
*/
function is_network_only_plugin( $plugin ) {
$plugin_data = get_plugin_data( WP_PLUGIN_DIR . '/' . $plugin );
diff --git a/wp-admin/includes/post.php b/wp-admin/includes/post.php
index 08d2e478c..e05fe2b26 100644
--- a/wp-admin/includes/post.php
+++ b/wp-admin/includes/post.php
@@ -15,7 +15,7 @@
* @since 2.6.0
*
* @param bool $update Are we updating a pre-existing post?
- * @param post_data array Array of post data. Defaults to the contents of $_POST.
+ * @param array $post_data Array of post data. Defaults to the contents of $_POST.
* @return object|bool WP_Error on failure, true on success.
*/
function _wp_translate_postdata( $update = false, $post_data = null ) {
@@ -353,7 +353,7 @@ function bulk_edit_posts( $post_data = null ) {
*
* @since unknown
*
- *@param string A post type string, defaults to 'post'.
+ * @param string $post_type A post type string, defaults to 'post'.
* @return object stdClass object containing all the default post data as attributes
*/
function get_default_post_to_edit( $post_type = 'post', $create_in_db = false ) {
diff --git a/wp-admin/includes/template.php b/wp-admin/includes/template.php
index f202b8d0e..c7bae92bf 100644
--- a/wp-admin/includes/template.php
+++ b/wp-admin/includes/template.php
@@ -712,14 +712,11 @@ function the_attachment_links( $id = false ) {
/**
- * Print out ";
else
$r .= "\n\t";
@@ -1268,9 +1265,8 @@ function get_settings_errors( $setting = '', $sanitize = FALSE ) {
* @param string $setting Optional slug title of a specific setting who's errors you want.
* @param boolean $sanitize Whether to re-sanitize the setting value before returning errors.
* @param boolean $hide_on_update If set to true errors will not be shown if the settings page has already been submitted.
- * @return
*/
-function settings_errors ( $setting = '', $sanitize = FALSE, $hide_on_update = FALSE ) {
+function settings_errors( $setting = '', $sanitize = FALSE, $hide_on_update = FALSE ) {
if ($hide_on_update AND $_GET['updated']) return;
@@ -1493,10 +1489,10 @@ function favorite_actions( $screen = null ) {
* returned.
*
* @since 2.7.0
- * @param int $id The post id. If not supplied the global $post is used.
- *
+ * @param int $post_id The post id. If not supplied the global $post is used.
+ * @return string The post title if set
*/
-function _draft_or_post_title($post_id = 0) {
+function _draft_or_post_title( $post_id = 0 ) {
$title = get_the_title($post_id);
if ( empty($title) )
$title = __('(no title)');
diff --git a/wp-includes/bookmark.php b/wp-includes/bookmark.php
index 641ae3b49..ddb5e1374 100644
--- a/wp-includes/bookmark.php
+++ b/wp-includes/bookmark.php
@@ -7,12 +7,12 @@
*/
/**
- * Retrieve Bookmark data based on ID
+ * Retrieve Bookmark data
*
* @since 2.1.0
* @uses $wpdb Database Object
*
- * @param int $bookmark_id
+ * @param mixed $bookmark
* @param string $output Optional. Either OBJECT, ARRAY_N, or ARRAY_A constant
* @param string $filter Optional, default is 'raw'.
* @return array|object Type returned depends on $output value.
diff --git a/wp-includes/cache.php b/wp-includes/cache.php
index 624386628..0afad7d09 100644
--- a/wp-includes/cache.php
+++ b/wp-includes/cache.php
@@ -110,7 +110,7 @@ function wp_cache_init() {
* @uses $wp_object_cache Object Cache Class
* @see WP_Object_Cache::replace()
*
- * @param int|string $id What to call the contents in the cache
+ * @param int|string $key What to call the contents in the cache
* @param mixed $data The contents to store in the cache
* @param string $flag Where to group the cache contents
* @param int $expire When to expire the cache contents
@@ -129,7 +129,7 @@ function wp_cache_replace($key, $data, $flag = '', $expire = 0) {
* @uses $wp_object_cache Object Cache Class
* @see WP_Object_Cache::set()
*
- * @param int|string $id What to call the contents in the cache
+ * @param int|string $key What to call the contents in the cache
* @param mixed $data The contents to store in the cache
* @param string $flag Where to group the cache contents
* @param int $expire When to expire the cache contents
diff --git a/wp-includes/category-template.php b/wp-includes/category-template.php
index 4f8e03ea4..9ba14a8b4 100644
--- a/wp-includes/category-template.php
+++ b/wp-includes/category-template.php
@@ -250,8 +250,8 @@ function get_the_category_list( $separator = '', $parents='', $post_id = false )
*
* @uses is_object_in_term()
*
- * @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
+ * @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)
* @return bool True if the current post is in any of the given categories.
*/
function in_category( $category, $_post = null ) {
@@ -987,7 +987,7 @@ function the_terms( $id, $taxonomy, $before = '', $sep = ', ', $after = '' ) {
* @uses is_object_in_term()
*
* @param string|int|array $tag Optional. The tag name/term_id/slug or array of them to check for.
- * @param int|post object Optional. Post to check instead of the current post. @since 2.7.0
+ * @param int|object $_post Optional. Post to check instead of the current post. (since 2.7.0)
* @return bool True if the current post has any of the the given tags (or any tag, if no tag specified).
*/
function has_tag( $tag = '', $_post = null ) {
diff --git a/wp-includes/classes.php b/wp-includes/classes.php
index 0693fe558..6fa4e03ba 100644
--- a/wp-includes/classes.php
+++ b/wp-includes/classes.php
@@ -980,8 +980,8 @@ class Walker {
*
* @package WordPress
* @since 2.7
- * @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.
+ * @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.
* @return XHTML of the specified page of elements
*/
function paged_walk( $elements, $max_depth, $page_num, $per_page ) {
diff --git a/wp-includes/comment-template.php b/wp-includes/comment-template.php
index 8cc38019e..211159de1 100644
--- a/wp-includes/comment-template.php
+++ b/wp-includes/comment-template.php
@@ -162,7 +162,7 @@ function get_comment_author_link( $comment_ID = 0 ) {
* @since 0.71
* @see get_comment_author_link() Echoes result
*
- * @param int The ID of the comment for which to print the author's link. Optional.
+ * @param int $comment_ID The ID of the comment for which to print the author's link. Optional.
*/
function comment_author_link( $comment_ID = 0 ) {
echo get_comment_author_link( $comment_ID );
diff --git a/wp-includes/comment.php b/wp-includes/comment.php
index 8cffff495..efe6bbec5 100644
--- a/wp-includes/comment.php
+++ b/wp-includes/comment.php
@@ -439,8 +439,8 @@ function get_comment_count( $post_id = 0 ) {
* @link http://codex.wordpress.org/Function_Reference/add_comment_meta
*
* @param int $comment_id Comment ID.
- * @param string $key Metadata name.
- * @param mixed $value Metadata value.
+ * @param string $meta_key Metadata name.
+ * @param mixed $meta_value Metadata value.
* @param bool $unique Optional, default is false. Whether the same key should not be added.
* @return bool False for failure. True for success.
*/
@@ -498,8 +498,8 @@ function get_comment_meta($comment_id, $key, $single = false) {
* @link http://codex.wordpress.org/Function_Reference/update_comment_meta
*
* @param int $comment_id Comment ID.
- * @param string $key Metadata key.
- * @param mixed $value Metadata value.
+ * @param string $meta_key Metadata key.
+ * @param mixed $meta_value Metadata value.
* @param mixed $prev_value Optional. Previous value to check before removing.
* @return bool False on failure, true if success.
*/
@@ -1858,7 +1858,7 @@ function weblog_ping($server = '', $path = '') {
* @package WordPress
* @subpackage Cache
*
- * @param int|array $id Comment ID or array of comment IDs to remove from cache
+ * @param int|array $ids Comment ID or array of comment IDs to remove from cache
*/
function clean_comment_cache($ids) {
foreach ( (array) $ids as $id )
diff --git a/wp-includes/deprecated.php b/wp-includes/deprecated.php
index 8d95a8a98..9775e827f 100644
--- a/wp-includes/deprecated.php
+++ b/wp-includes/deprecated.php
@@ -164,10 +164,10 @@ function previous_post($format='%', $previous='previous post: ', $title='yes', $
* @see next_post_link()
*
* @param string $format
- * @param string $previous
+ * @param string $next
* @param string $title
* @param string $in_same_cat
- * @param int $limitprev
+ * @param int $limitnext
* @param string $excluded_categories
*/
function next_post($format='%', $next='next post: ', $title='yes', $in_same_cat='no', $limitnext=1, $excluded_categories='') {
@@ -872,7 +872,7 @@ function permalink_link() {
* @deprecated Use the_permalink_rss()
* @see the_permalink_rss()
*
- * @param string $file
+ * @param string $deprecated
*/
function permalink_single_rss($deprecated = '') {
_deprecated_function( __FUNCTION__, '2.3', 'the_permalink_rss()' );
diff --git a/wp-includes/formatting.php b/wp-includes/formatting.php
index af6f6babf..c940a35d5 100644
--- a/wp-includes/formatting.php
+++ b/wp-includes/formatting.php
@@ -1474,7 +1474,7 @@ function convert_smilies($text) {
* @since 0.71
*
* @param string $email Email address to verify.
- * @param boolean $deprecated. Deprecated.
+ * @param boolean $deprecated Deprecated.
* @return string|bool Either false or the valid email address.
*/
function is_email( $email, $deprecated = false ) {
diff --git a/wp-includes/functions.php b/wp-includes/functions.php
index bc5712b50..ac1176951 100644
--- a/wp-includes/functions.php
+++ b/wp-includes/functions.php
@@ -4177,7 +4177,7 @@ function wp_scheduled_delete() {
* @since 2.9.0
*
* @param string $file Path to the file
- * @param bool $markup If the returned data should have HTML markup applied
+ * @param array $default_headers Default metadata headers
* @param string $context If specified adds filter hook "extra_<$context>_headers"
*/
function get_file_data( $file, $default_headers, $context = '' ) {
diff --git a/wp-includes/functions.wp-scripts.php b/wp-includes/functions.wp-scripts.php
index f284435ef..90e7a0b02 100644
--- a/wp-includes/functions.wp-scripts.php
+++ b/wp-includes/functions.wp-scripts.php
@@ -42,7 +42,7 @@ function wp_print_scripts( $handles = false ) {
* @param string $src Script url
* @param array $deps (optional) Array of script names on which this script depends
* @param string|bool $ver (optional) Script version (used for cache busting), set to NULL to disable
- * @param bool (optional) Wether to enqueue the script before or before