Changeset 41684 for trunk/src/wp-includes/taxonomy.php

Timestamp:

10/02/2017 09:51:09 PM (9 years ago)

Author:

afercia

Message:

Quick/Bulk Edit: Improve the inline error messages styling.

• uses the core notice styles for the Quick Edit form inline error messages
• adds missing periods at the end of a few error messages

Props ocean90, karmatosed, melchoyce, afercia.
Fixes #35496.

File:

• trunk/src/wp-includes/taxonomy.php (modified) (8 diffs)

trunk/src/wp-includes/taxonomy.php

@@ -425 +425 @@
     // Do not allow unregistering internal taxonomies.
     if ( $taxonomy_object->_builtin ) {
-        return new WP_Error( 'invalid_taxonomy', __( 'Unregistering a built-in taxonomy is not allowed' ) );
+        return new WP_Error( 'invalid_taxonomy', __( 'Unregistering a built-in taxonomy is not allowed.' ) );
     }
 
@@ -747 +747 @@
 function get_term( $term, $taxonomy = '', $output = OBJECT, $filter = 'raw' ) {
     if ( empty( $term ) ) {
-        return new WP_Error( 'invalid_term', __( 'Empty Term' ) );
+        return new WP_Error( 'invalid_term', __( 'Empty Term.' ) );
     }
 
@@ -2124 +2124 @@
 
     if ( false === $wpdb->insert( $wpdb->terms, $data ) ) {
-        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 );
     }
 
@@ -2348 +2348 @@
         if ( $values )
             if ( false === $wpdb->query( "INSERT INTO $wpdb->term_relationships (object_id, term_taxonomy_id, term_order) VALUES " . join( ',', $values ) . " ON DUPLICATE KEY UPDATE term_order = VALUES(term_order)" ) )
-                return new WP_Error( 'db_insert_error', __( 'Could not insert term relationship into the database' ), $wpdb->last_error );
+                return new WP_Error( 'db_insert_error', __( 'Could not insert term relationship into the database.' ), $wpdb->last_error );
     }
 
@@ -2616 +2616 @@
 
     if ( ! $term ) {
-        return new WP_Error( 'invalid_term', __( 'Empty Term' ) );
+        return new WP_Error( 'invalid_term', __( 'Empty Term.' ) );
     }
 
@@ -2702 +2702 @@
         } else {
             /* translators: 1: Taxonomy term slug */
-            return new WP_Error('duplicate_term_slug', sprintf(__('The slug “%s” is already in use by another term'), $slug));
+            return new WP_Error( 'duplicate_term_slug', sprintf( __( 'The slug “%s” is already in use by another term.' ), $slug ) );
         }
     }
@@ -3917 +3917 @@
 
     if ( !is_object($term) )
-        $term = new WP_Error('invalid_term', __('Empty Term'));
+        $term = new WP_Error( 'invalid_term', __( 'Empty Term.' ) );
 
     if ( is_wp_error( $term ) )
@@ -4129 +4129 @@
 function is_object_in_term( $object_id, $taxonomy, $terms = null ) {
     if ( !$object_id = (int) $object_id )
-        return new WP_Error( 'invalid_object', __( 'Invalid object ID' ) );
+        return new WP_Error( 'invalid_object', __( 'Invalid object ID.' ) );
 
     $object_terms = get_object_term_cache( $object_id, $taxonomy );