Changeset 5792 for trunk/bp-xprofile/bp-xprofile-template.php

Timestamp:

02/15/2012 08:44:52 PM (13 years ago)

Author:

boonebgorges

Message:

Changes 'privacy' to 'visibility' throughout, when referencing xprofile fields. See #3695. Props DJPaul.

File:

• trunk/bp-xprofile/bp-xprofile-template.php (modified) (7 diffs)

trunk/bp-xprofile/bp-xprofile-template.php

@@ -25 +25 @@
     var $user_id;
 
-    function __construct( $user_id, $profile_group_id, $hide_empty_groups = false, $fetch_fields = false, $fetch_field_data = false, $exclude_groups = false, $exclude_fields = false, $hide_empty_fields = false, $fetch_privacy_level = false ) {
+    function __construct( $user_id, $profile_group_id, $hide_empty_groups = false, $fetch_fields = false, $fetch_field_data = false, $exclude_groups = false, $exclude_fields = false, $hide_empty_fields = false, $fetch_visibility_level = false ) {
         $this->groups = BP_XProfile_Group::get( array(
             'profile_group_id'    => $profile_group_id,
@@ -33 +33 @@
             'fetch_fields'        => $fetch_fields,
             'fetch_field_data'    => $fetch_field_data,
-            'fetch_privacy_level' => $fetch_privacy_level,
+            'fetch_visibility_level' => $fetch_visibility_level,
             'exclude_groups'      => $exclude_groups,
             'exclude_fields'      => $exclude_fields
@@ -159 +159 @@
     $hide_empty_fields_default = ( !is_network_admin() && !is_admin() && !bp_is_user_profile_edit() && !bp_is_register_page() );
     
-    // We only need to fetch privacy levels when viewing your own profile
+    // We only need to fetch visibility levels when viewing your own profile
     if ( bp_is_my_profile() || bp_current_user_can( 'bp_moderate' ) ) {
-        $fetch_privacy_level_default = true;
+        $fetch_visibility_level_default = true;
     } else {
-        $fetch_privacy_level_default = false;
+        $fetch_visibility_level_default = false;
     }
     
@@ -173 +173 @@
         'fetch_fields'        => true,
         'fetch_field_data'    => true,
-        'fetch_privacy_level' => $fetch_privacy_level_default,
+        'fetch_visibility_level' => $fetch_visibility_level_default,
         'exclude_groups'      => false, // Comma-separated list of profile field group IDs to exclude
         'exclude_fields'      => false  // Comma-separated list of profile field IDs to exclude
@@ -181 +181 @@
     extract( $r, EXTR_SKIP );
 
-    $profile_template = new BP_XProfile_Data_Template( $user_id, $profile_group_id, $hide_empty_groups, $fetch_fields, $fetch_field_data, $exclude_groups, $exclude_fields, $hide_empty_fields, $fetch_privacy_level );
+    $profile_template = new BP_XProfile_Data_Template( $user_id, $profile_group_id, $hide_empty_groups, $fetch_fields, $fetch_field_data, $exclude_groups, $exclude_fields, $hide_empty_fields, $fetch_visibility_level );
     return apply_filters( 'bp_has_profile', $profile_template->has_groups(), $profile_template );
 }
@@ -708 +708 @@
 
 /**
- * Echo the privacy level of this field
+ * Echo the visibility level of this field
  */
-function bp_the_profile_field_privacy_level() {
-    echo bp_get_the_profile_field_privacy_level();
+function bp_the_profile_field_visibility_level() {
+    echo bp_get_the_profile_field_visibility_level();
 }
     /**
-     * Return the privacy level of this field
+     * Return the visibility level of this field
      */
-    function bp_get_the_profile_field_privacy_level() {
+    function bp_get_the_profile_field_visibility_level() {
         global $field;
         
-        $retval = !empty( $field->privacy_level ) ? $field->privacy_level : 'public';
+        $retval = !empty( $field->visibility_level ) ? $field->visibility_level : 'public';
         
-        return apply_filters( 'bp_get_the_profile_field_privacy_level', $retval );
+        return apply_filters( 'bp_get_the_profile_field_visibility_level', $retval );
     }
 
 /**
- * Echo the privacy level label of this field
+ * Echo the visibility level label of this field
  */
-function bp_the_profile_field_privacy_level_label() {
-    echo bp_get_the_profile_field_privacy_level_label();
+function bp_the_profile_field_visibility_level_label() {
+    echo bp_get_the_profile_field_visibility_level_label();
 }
     /**
-     * Return the privacy level label of this field
+     * Return the visibility level label of this field
      */
-    function bp_get_the_profile_field_privacy_level_label() {
+    function bp_get_the_profile_field_visibility_level_label() {
         global $field;
         
-        $level  = !empty( $field->privacy_level ) ? $field->privacy_level : 'public';
-        $fields = bp_xprofile_get_privacy_levels();
+        $level  = !empty( $field->visibility_level ) ? $field->visibility_level : 'public';
+        $fields = bp_xprofile_get_visibility_levels();
         
-        return apply_filters( 'bp_get_the_profile_field_privacy_level_label', $fields[$level]['label'] );
+        return apply_filters( 'bp_get_the_profile_field_visibility_level_label', $fields[$level]['label'] );
     }
 
@@ -886 +886 @@
 
 /**
- * Echo the field privacy radio buttons
+ * Echo the field visibility radio buttons
  */
-function bp_profile_privacy_radio_buttons() {
-    echo bp_profile_get_privacy_radio_buttons();
+function bp_profile_visibility_radio_buttons() {
+    echo bp_profile_get_visibility_radio_buttons();
 }
     /**
-     * Return the field privacy radio buttons
+     * Return the field visibility radio buttons
      */
-    function bp_profile_get_privacy_radio_buttons() {       
+    function bp_profile_get_visibility_radio_buttons() {        
         $html = '<ul class="radio">';
         
-        foreach( bp_xprofile_get_privacy_levels() as $level ) {
-            $checked = $level['id'] == bp_get_the_profile_field_privacy_level() ? ' checked="checked" ' : '';
+        foreach( bp_xprofile_get_visibility_levels() as $level ) {
+            $checked = $level['id'] == bp_get_the_profile_field_visibility_level() ? ' checked="checked" ' : '';
             
-            $html .= '<li><input type="radio" name="field_' . bp_get_the_profile_field_id() . '_privacy" value="' . esc_attr( $level['id'] ) . '"' . $checked . '> ' . esc_html( $level['label'] ) . '</li>';
+            $html .= '<li><input type="radio" name="field_' . bp_get_the_profile_field_id() . '_visibility" value="' . esc_attr( $level['id'] ) . '"' . $checked . '> ' . esc_html( $level['label'] ) . '</li>';
         }
         
         $html .= '</ul>';
         
-        return apply_filters( 'bp_profile_get_privacy_radio_buttons', $html );
+        return apply_filters( 'bp_profile_get_visibility_radio_buttons', $html );
     }
 ?>