Changeset 35139

Timestamp:

10/13/2015 04:39:47 PM (11 years ago)

Author:

wonderboymusic

Message:

Taxonomy: get_terms_to_edit() can also return false or WP_Error. Vars using it should be set to empty string when errors are returned to avoid producing fatal errors when used in string operations.

Props valendesigns.
Fixes #30472.

Location:

trunk/src/wp-admin/includes

Files:

• meta-boxes.php (modified) (2 diffs)
• template-functions.php (modified) (1 diff)

trunk/src/wp-admin/includes/meta-boxes.php

@@ -428 +428 @@
     $user_can_assign_terms = current_user_can( $taxonomy->cap->assign_terms );
     $comma = _x( ',', 'tag delimiter' );
+    $terms_to_edit = get_terms_to_edit( $post->ID, $tax_name );
+    if ( ! is_string( $terms_to_edit ) ) {
+        $terms_to_edit = '';
+    }
 ?>
 <div class="tagsdiv" id="<?php echo $tax_name; ?>">
@@ -433 +437 @@
     <div class="nojs-tags hide-if-js">
     <p><?php echo $taxonomy->labels->add_or_remove_items; ?></p>
-    <textarea name="<?php echo "tax_input[$tax_name]"; ?>" rows="3" cols="20" class="the-tags" id="tax-input-<?php echo $tax_name; ?>" <?php disabled( ! $user_can_assign_terms ); ?>><?php echo str_replace( ',', $comma . ' ', get_terms_to_edit( $post->ID, $tax_name ) ); // textarea_escaped by esc_attr() ?></textarea></div>
+    <textarea name="<?php echo "tax_input[$tax_name]"; ?>" rows="3" cols="20" class="the-tags" id="tax-input-<?php echo $tax_name; ?>" <?php disabled( ! $user_can_assign_terms ); ?>><?php echo str_replace( ',', $comma . ' ', $terms_to_edit ); // textarea_escaped by esc_attr() ?></textarea></div>
     <?php if ( $user_can_assign_terms ) : ?>
     <div class="ajaxtag hide-if-no-js">

trunk/src/wp-admin/includes/template-functions.php

@@ -315 +315 @@
         } elseif ( $taxonomy->show_ui ) {
 
+            $terms_to_edit = get_terms_to_edit( $post->ID, $taxonomy_name );
+            if ( ! is_string( $terms_to_edit ) ) {
+                $terms_to_edit = '';
+            }
+
             echo '<div class="tags_input" id="'.$taxonomy_name.'_'.$post->ID.'">'
-                . esc_html( str_replace( ',', ', ', get_terms_to_edit( $post->ID, $taxonomy_name ) ) ) . '</div>';
+                . esc_html( str_replace( ',', ', ', $terms_to_edit ) ) . '</div>';
 
         }