Changeset 40999

Timestamp:

07/04/2017 07:58:35 PM (7 years ago)

Author:

boonebgorges

Message:

Avoid PHP notices when checking termmeta capabilities against a non-existent term.

Previously, checks like current_user_can( 'edit_term_meta', $term_id )
returned the proper value, but generated a PHP notice due to the fact
that get_term( $term_id ) could, in certain instances, return
WP_Error objects.

Props caercam.
Fixes #40891.

Location:

trunk

Files:

• src/wp-includes/capabilities.php (modified) (1 diff)
• tests/phpunit/tests/user/capabilities.php (modified) (1 diff)

trunk/src/wp-includes/capabilities.php

@@ -281 +281 @@
             case 'term':
                 $term = get_term( $object_id );
-                if ( ! $term ) {
+                if ( ! $term instanceof WP_Term ) {
                     break;
                 }

trunk/tests/phpunit/tests/user/capabilities.php

@@ -1355 +1355 @@
 
     /**
+     * @ticket 40891
+     */
+    public function test_taxonomy_meta_capabilities_with_non_existent_terms() {
+        $caps = array(
+            'add_term_meta',
+            'delete_term_meta',
+            'edit_term_meta',
+        );
+
+        $taxonomy = 'wptests_tax';
+        register_taxonomy( $taxonomy, 'post' );
+
+        $editor = self::$users['editor'];
+
+        foreach ( $caps as $cap ) {
+            // `null` represents a non-existent term ID.
+            $this->assertFalse( user_can( $editor->ID, $cap, null ) );
+        }
+    }
+
+    /**
      * @ticket 21786
      */