Upstream/WordPress
1
0
Fork 0
mirror of https://github.com/WordPress/WordPress.git synced 2025-01-09 18:08:09 +01:00
Code Issues Projects Releases Wiki Activity

Prevent Terms from being created in multiple taxonomies. If a slug is provided by the user, error out if it exists, else make the auto slug unique. See #11838

Browse Source 
git-svn-id: http://svn.automattic.com/wordpress/trunk@13087 1a063a9b-81f0-0310-95a4-ce76da25c4cd
This commit is contained in:
dd32 2010-02-13 05:52:27 +00:00
parent c9ea3a7686
commit d5eac90642
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
wp-includes/taxonomy.php
View File

@ -1436,6 +1436,8 @@ function wp_insert_term( $term, $taxonomy, $args = array() ) {
if ( empty($slug) ) if ( empty($slug) )
$slug = sanitize_title($name); $slug = sanitize_title($name);
elseif ( is_term($slug) ) // Provided slug issue.
return new WP_Error('term_slug_exists', __('A Term with the slug provided already exists.'));
$term_group = 0; $term_group = 0;
if ( $alias_of ) { if ( $alias_of ) {
@ -1452,7 +1454,9 @@ function wp_insert_term( $term, $taxonomy, $args = array() ) {
} }
} }
if ( ! $term_id = is_term($slug) ) { if ( ! $term_id = is_term($slug, $taxonomy) ) {
// Make sure the slug is unique accross all taxonomies.
$slug = wp_unique_term_slug($slug, (object) $args);
if ( !is_multisite() ) { if ( !is_multisite() ) {
if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) ) if ( false === $wpdb->insert( $wpdb->terms, compact( 'name', 'slug', 'term_group' ) ) )
return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error); return new WP_Error('db_insert_error', __('Could not insert term into the database'), $wpdb->last_error);