Changeset 10778

Timestamp:

05/19/2016 02:51:45 AM (9 years ago)

Author:

boonebgorges

Message:

XProfile: Only cache field object when query is successful.

Previously, a PHP notice was being thrown when a bad $field_id was passed
to BP_XProfile_Field::get_instance().

Props mmcachran.
Fixes #7073.

Location:

trunk

Files:

• src/bp-xprofile/classes/class-bp-xprofile-field.php (modified) (1 diff)
• tests/phpunit/testcases/xprofile/class-bp-xprofile-field.php (modified) (1 diff)

trunk/src/bp-xprofile/classes/class-bp-xprofile-field.php

@@ -238 +238 @@
             $field = $wpdb->get_row( $wpdb->prepare( "SELECT * FROM {$bp->profile->table_name_fields} WHERE id = %d", $field_id ) );
 
-            wp_cache_add( $field->id, $field, 'bp_xprofile_fields' );
-
             if ( ! $field ) {
                 return false;
             }
+
+            wp_cache_add( $field->id, $field, 'bp_xprofile_fields' );
         }
 

trunk/tests/phpunit/testcases/xprofile/class-bp-xprofile-field.php

@@ -175 +175 @@
         $this->assertSame( $num_queries, $wpdb->num_queries );
     }
+
+    /**
+     * @ticket BP7073
+     */
+    public function test_bad_field_id_should_not_be_cached() {
+        BP_XProfile_Field::get_instance( 12345 );
+
+        $this->assertFalse( wp_cache_get( 12345, 'bp_xprofile_fields' ) );
+    }
 }