Changeset 32954

Timestamp:

06/26/2015 02:12:27 PM (9 years ago)

Author:

boonebgorges

Message:

Improve error checking in get_edit_term_link().

The function should not throw notices when an improper term or taxonomy is
passed.

Props tmatsuur, MikeHansenMe.
Fixes #32786.

Location:

trunk

Files:

• src/wp-includes/link-template.php (modified) (1 diff)
• tests/phpunit/tests/term/getEditTermLink.php (added)

trunk/src/wp-includes/link-template.php

@@ -904 +904 @@
  * @param string $object_type The object type. Used to highlight the proper post type menu on the linked page.
  *                            Defaults to the first object_type associated with the taxonomy.
- * @return string The edit term link URL for the given term.
+ * @return string|null The edit term link URL for the given term, or null on failure.
  */
 function get_edit_term_link( $term_id, $taxonomy, $object_type = '' ) {
     $tax = get_taxonomy( $taxonomy );
-    if ( !current_user_can( $tax->cap->edit_terms ) )
+    if ( ! $tax || ! current_user_can( $tax->cap->edit_terms ) ) {
         return;
+    }
 
     $term = get_term( $term_id, $taxonomy );
+    if ( ! $term || is_wp_error( $term ) ) {
+        return;
+    }
 
     $args = array(