Changeset 5699 for trunk/bp-xprofile/bp-xprofile-functions.php

Timestamp:

02/11/2012 02:14:07 AM (13 years ago)

Author:

johnjamesjacoby

Message:

Remove unneeded globals and clean up some code in XProfile component. See #3989.

File:

• trunk/bp-xprofile/bp-xprofile-functions.php (modified) (11 diffs)

trunk/bp-xprofile/bp-xprofile-functions.php

@@ -1 +1 @@
 <?php
-/********************************************************************************
- * Business Functions
+
+/**
+ * BuddyPress XProfile Filters
  *
  * Business functions are where all the magic happens in BuddyPress. They will
@@ -7 +8 @@
  * hand off to a database class for data access, then return
  * true or false on success or failure.
+ *
+ * @package BuddyPress
+ * @subpackage XProfileFilters
  */
 
@@ -25 +29 @@
     extract( $r, EXTR_SKIP );
 
-    if ( !$name )
+    if ( empty( $name ) )
         return false;
 
@@ -79 +83 @@
 
     // Check we have the minimum details
-    if ( !$field_group_id )
+    if ( empty( $field_group_id ) )
         return false;
 
@@ -87 +91 @@
 
     // Instantiate a new field object
-    if ( $field_id )
+    if ( !empty( $field_id ) )
         $field = new BP_XProfile_Field( $field_id );
     else
@@ -148 +152 @@
  * @param mixed $field The ID of the field, or the $name of the field.
  * @param int $user_id The ID of the user
- * @global object $bp Global BuddyPress settings object
  * @uses BP_XProfile_ProfileData::get_value_byid() Fetches the value based on the params passed.
  * @return mixed The profile field data.
  */
 function xprofile_get_field_data( $field, $user_id = 0 ) {
-    global $bp;
 
     if ( empty( $user_id ) )
@@ -216 +218 @@
     }
 
+    $possible_values = array();
+
     // Check the value is an acceptable value
     if ( 'checkbox' == $field->type || 'radio' == $field->type || 'selectbox' == $field->type || 'multiselectbox' == $field->type ) {
@@ -225 +229 @@
         if ( is_array( $value ) ) {
             foreach( $value as $i => $single ) {
-                if ( !in_array( $single, (array)$possible_values ) ) {
+                if ( !in_array( $single, $possible_values ) ) {
                     unset( $value[$i] );
                 }
@@ -233 +237 @@
             $value = array_merge( array(), $value );
         } else {
-            if ( !in_array( $value, (array)$possible_values ) ) {
+            if ( !in_array( $value, $possible_values ) ) {
                 return false;
             }
@@ -301 +305 @@
  */
 function xprofile_get_random_profile_data( $user_id, $exclude_fullname = true ) {
-    $field_data           = BP_XProfile_ProfileData::get_random( $user_id, $exclude_fullname );
-
-    if ( !$field_data )
+    $field_data = BP_XProfile_ProfileData::get_random( $user_id, $exclude_fullname );
+
+    if ( empty( $field_data ) )
         return false;
 
     $field_data[0]->value = xprofile_format_profile_field( $field_data[0]->type, $field_data[0]->value );
 
-    if ( !$field_data[0]->value || empty( $field_data[0]->value ) )
+    if ( empty( $field_data[0]->value ) )
         return false;
 
@@ -352 +356 @@
  */
 function xprofile_avatar_upload_dir( $directory = false, $user_id = 0 ) {
-    global $bp;
 
     if ( empty( $user_id ) )