Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2024-09-27 14:53:08 +02:00
Code Issues Projects Releases Wiki Activity

Use the correct hash notation syntax for the wp_insert_term() DocBlock.

Browse Source 
See #28298.

Built from https://develop.svn.wordpress.org/trunk@30724


git-svn-id: http://core.svn.wordpress.org/trunk@30714 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Drew Jaynes 2014-12-03 10:17:24 +00:00
parent 68ed7af808
commit 27297bcddf
2 changed files with 10 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
wp-includes/taxonomy.php
View File

@ -2761,20 +2761,18 @@ function wp_get_object_terms($object_ids, $taxonomies, $args = array()) {
* @since 2.3.0
*
* @param string $term The term to add or update.
* @param string $taxonomy The taxonomy to which to add the term
* @param string $taxonomy The taxonomy to which to add the term.
* @param array|string $args {
* Arguments to change values of the inserted term.
* Optional. Array or string of arguments for inserting a term.
*
* @type string 'alias_of' Slug of the term to make this term an alias of.
* Default empty string. Accepts a term slug.
* @type string 'description' The term description.
* Default empty string.
* @type int 'parent' The id of the parent term.
* Default 0.
* @type string 'slug' The term slug to use.
* Default empty string.
* @type string $alias_of Slug of the term to make this term an alias of.
* Default empty string. Accepts a term slug.
* @type string $description The term description. Default empty string.
* @type int $parent The id of the parent term. Default 0.
* @type string $slug The term slug to use. Default empty string.
* }
* @return array|WP_Error An array containing the term_id and term_taxonomy_id, WP_Error otherwise.
* @return array|WP_Error An array containing the `term_id` and `term_taxonomy_id`,
* {@see WP_Error} otherwise.
*/
function wp_insert_term( $term, $taxonomy, $args = array() ) {
global $wpdb;

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
*
* @global string $wp_version
*/
$wp_version = '4.1-beta2-30723';
$wp_version = '4.1-beta2-30724';
/**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.