WordPress-C
/
WordPress
mirror of https://github.com/WordPress/WordPress.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Taxonomy: Use `Invalid taxonomy` instead of `Invalid Taxonomy` for error strings. 

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


git-svn-id: http://core.svn.wordpress.org/trunk@36211 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
Pascal Birchler 2016-01-09 15:16:25 +00:00
parent 710501dc53
commit 2e4210e209
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
wp-includes/taxonomy.php
View File

@ -490,7 +490,7 @@ function register_taxonomy( $taxonomy, $object_type, $args = array() ) {
*/ */
function unregister_taxonomy( $taxonomy ) { function unregister_taxonomy( $taxonomy ) {
if ( ! taxonomy_exists( $taxonomy ) ) { if ( ! taxonomy_exists( $taxonomy ) ) {
return new WP_Error( 'invalid_taxonomy', __( 'Invalid Taxonomy' ) ); return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy' ) );
} }
$taxonomy_args = get_taxonomy( $taxonomy ); $taxonomy_args = get_taxonomy( $taxonomy );
@ -2994,7 +2994,7 @@ function wp_remove_object_terms( $object_id, $terms, $taxonomy ) {
$object_id = (int) $object_id; $object_id = (int) $object_id;
if ( ! taxonomy_exists( $taxonomy ) ) { if ( ! taxonomy_exists( $taxonomy ) ) {
return new WP_Error( 'invalid_taxonomy', __( 'Invalid Taxonomy' ) ); return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy' ) );
} }
if ( ! is_array( $terms ) ) { if ( ! is_array( $terms ) ) {

2
wp-includes/version.php
View File

@ -4,7 +4,7 @@
* *
* @global string $wp_version * @global string $wp_version
*/ */
$wp_version = '4.5-alpha-36243'; $wp_version = '4.5-alpha-36244';
/** /**
* Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema. * Holds the WordPress DB revision, increments when changes are made to the WordPress DB schema.