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

Timestamp:

07/17/2016 04:14:27 PM (9 years ago)

Author:

SergeyBiryukov

Message:

Text Changes: Add a full stop to "Invalid taxonomy" and "Invalid term ID" strings, for consistency with similar post-related messages.

See #18218, #32329.

File:

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

trunk/src/wp-includes/taxonomy.php

@@ -506 +506 @@
 function unregister_taxonomy( $taxonomy ) {
     if ( ! taxonomy_exists( $taxonomy ) ) {
-        return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy' ) );
+        return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
     }
 
@@ -737 +737 @@
     foreach ( (array) $taxonomies as $taxonomy ) {
         if ( ! taxonomy_exists( $taxonomy ) ) {
-            return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy' ) );
+            return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
         }
     }
@@ -827 +827 @@
 
     if ( $taxonomy && ! taxonomy_exists( $taxonomy ) ) {
-        return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy' ) );
+        return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
     }
 
@@ -989 +989 @@
  */
 function get_term_children( $term_id, $taxonomy ) {
-    if ( ! taxonomy_exists($taxonomy) )
-        return new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
+    if ( ! taxonomy_exists( $taxonomy ) ) {
+        return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
+    }
 
     $term_id = intval( $term_id );
@@ -1209 +1210 @@
         foreach ( $args['taxonomy'] as $taxonomy ) {
             if ( ! taxonomy_exists( $taxonomy ) ) {
-                return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy' ) );
+                return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
             }
         }
@@ -1976 +1977 @@
     foreach ( $taxonomies as $taxonomy ) {
         if ( ! taxonomy_exists($taxonomy) )
-            return new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
+            return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
     }
 
@@ -2227 +2228 @@
 
     if ( ! taxonomy_exists($taxonomy) ) {
-        return new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
+        return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
     }
     /**
@@ -2242 +2243 @@
     }
     if ( is_int($term) && 0 == $term ) {
-        return new WP_Error('invalid_term_id', __('Invalid term ID'));
+        return new WP_Error( 'invalid_term_id', __( 'Invalid term ID.' ) );
     }
     if ( '' == trim($term) ) {
-        return new WP_Error('empty_term_name', __('A name is required for this term'));
+        return new WP_Error( 'empty_term_name', __( 'A name is required for this term.' ) );
     }
     $defaults = array( 'alias_of' => '', 'description' => '', 'parent' => 0, 'slug' => '');
@@ -2474 +2475 @@
     $object_id = (int) $object_id;
 
-    if ( ! taxonomy_exists($taxonomy) )
-        return new WP_Error('invalid_taxonomy', __('Invalid taxonomy'));
+    if ( ! taxonomy_exists( $taxonomy ) ) {
+        return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
+    }
 
     if ( !is_array($terms) )
@@ -2612 +2614 @@
 
     if ( ! taxonomy_exists( $taxonomy ) ) {
-        return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy' ) );
+        return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
     }
 
@@ -2808 +2810 @@
 
     if ( ! taxonomy_exists( $taxonomy ) ) {
-        return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy' ) );
+        return new WP_Error( 'invalid_taxonomy', __( 'Invalid taxonomy.' ) );
     }