Changeset 11030 for trunk/src/bp-xprofile/classes/class-bp-xprofile-field.php

Timestamp:

08/22/2016 10:38:28 PM (8 years ago)

Author:

r-a-y

Message:

XProfile: Cast properties as integers where appropriate.

See #6977.

File:

• trunk/src/bp-xprofile/classes/class-bp-xprofile-field.php (modified) (3 diffs)

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

@@ -258 +258 @@
         }
 
+        $int_fields = array(
+            'id', 'is_required', 'group_id', 'parent_id', 'is_default_option',
+            'field_order', 'option_order', 'can_delete'
+        );
+
         foreach ( $args as $k => $v ) {
             if ( 'name' === $k || 'description' === $k ) {
                 $v = stripslashes( $v );
             }
+
+            // Cast numeric strings as integers.
+            if ( true === in_array( $k, $int_fields ) ) {
+                $v = (int) $v;
+            }
+
             $this->{$k} = $v;
         }
@@ -890 +901 @@
      *
      * @param string $field_name Name of the field to query the ID for.
-     * @return boolean
+     * @return int|null Field ID on success; null on failure.
      */
     public static function get_id_from_name( $field_name = '' ) {
@@ -903 +914 @@
         $sql = $wpdb->prepare( "SELECT id FROM {$bp->profile->table_name_fields} WHERE name = %s AND parent_id = 0", $field_name );
 
-        return $wpdb->get_var( $sql );
+        $query = $wpdb->get_var( $sql );
+
+        return is_numeric( $query ) ? (int) $query : $query;
     }