Changeset 9703

Timestamp:

04/06/2015 04:09:12 PM (11 years ago)

Author:

johnjamesjacoby

Message:

XProfile: Quick clean-up to BP_XProfile_Query

• Remove unused $wpdb global reference
• Remove unused $context parameter in get_sql() method
• Add brackets to conditionals

See #6346.

File:

• trunk/src/bp-xprofile/classes/class-bp-xprofile-query.php (modified) (2 diffs)

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

@@ -180 +180 @@
          */
         public function get_cast_for_type( $type = '' ) {
-                if ( empty( $type ) )
+                if ( empty( $type ) ) {
                         return 'CHAR';
+                }
 
                 $meta_type = strtoupper( $type );
 
-                if ( ! preg_match( '/^(?:BINARY|CHAR|DATE|DATETIME|SIGNED|UNSIGNED|TIME|NUMERIC(?:\(\d+(?:,\s?\d+)?\))?|DECIMAL(?:\(\d+(?:,\s?\d+)?\))?)$/', $meta_type ) )
+                if ( ! preg_match( '/^(?:BINARY|CHAR|DATE|DATETIME|SIGNED|UNSIGNED|TIME|NUMERIC(?:\(\d+(?:,\s?\d+)?\))?|DECIMAL(?:\(\d+(?:,\s?\d+)?\))?)$/', $meta_type ) ) {
                         return 'CHAR';
-
-                if ( 'NUMERIC' == $meta_type )
+                }
+
+                if ( 'NUMERIC' === $meta_type ) {
                         $meta_type = 'SIGNED';
+                }
 
                 return $meta_type;
@@ -323 +326 @@
          * }
          */
-        public function get_sql( $primary_table, $primary_id_column, $context = null ) {
-                global $wpdb;
+        public function get_sql( $primary_table, $primary_id_column ) {
 
                 $this->primary_table     = $primary_table;