Changeset 12390

Timestamp:

04/28/2019 11:10:31 PM (7 years ago)

Author:

imath

Message:

Make sure custom visibility is disabled for the default profile field

props venutius

Fixes #8042

Location:

trunk/src

Files:

• bp-core/admin/bp-core-admin-schema.php (modified) (1 diff)
• bp-core/bp-core-update.php (modified) (2 diffs)
• class-buddypress.php (modified) (1 diff)

trunk/src/bp-core/admin/bp-core-admin-schema.php

@@ -383 +383 @@
         if ( ! $wpdb->get_var( "SELECT id FROM {$bp_prefix}bp_xprofile_fields WHERE id = 1" ) ) {
                 $insert_sql[] = "INSERT INTO {$bp_prefix}bp_xprofile_fields ( group_id, parent_id, type, name, description, is_required, can_delete ) VALUES ( 1, 0, 'textbox', " . $wpdb->prepare( '%s', stripslashes( bp_get_option( 'bp-xprofile-fullname-field-name' ) ) ) . ", '', 1, 0 );";
+
+                // Make sure the custom visibility is disabled for the default field.
+                if ( ! $wpdb->get_var( "SELECT id FROM {$bp_prefix}bp_xprofile_meta WHERE id = 1" ) ) {
+                        $insert_sql[] = "INSERT INTO {$bp_prefix}bp_xprofile_meta ( object_id, object_type, meta_key, meta_value ) VALUES ( 1, 'field', 'allow_custom_visibility', 'disabled' );";
+                }
         }
 

trunk/src/bp-core/bp-core-update.php

@@ -269 +269 @@
                         bp_update_to_2_7();
                 }
+
+                // Version 5.0.0.
+                if ( $raw_db_version < 12385 ) {
+                        bp_update_to_5_0();
+                }
         }
 
@@ -541 +546 @@
         // Do not ignore deprecated code for existing installs.
         bp_add_option( '_bp_ignore_deprecated_code', false );
+}
+
+/**
+ * 5.0.0 update routine.
+ *
+ * - Make sure the custom visibility is disabled for the default profile field.
+ *
+ * @since 5.0.0
+ */
+function bp_update_to_5_0() {
+        /**
+         * The xProfile component is active by default on new installs, even if it
+         * might be inactive during this update, we need to set the custom visibility
+         * for the default field, in case the Administrator decides to reactivate it.
+         */
+        global $wpdb;
+        $bp_prefix = bp_core_get_table_prefix();
+        $field_id  = $wpdb->get_var( $wpdb->prepare( "SELECT id FROM {$bp_prefix}bp_xprofile_fields WHERE name = %s", addslashes( bp_get_option( 'bp-xprofile-fullname-field-name' ) ) ) );
+
+        $wpdb->insert(
+                $bp_prefix . 'bp_xprofile_meta',
+                array(
+                        'object_id'   => $field_id,
+                        'object_type' => 'field',
+                        'meta_key'    => 'allow_custom_visibility',
+                        'meta_value'  => 'disabled'
+                ),
+                array(
+                        '%d',
+                        '%s',
+                        '%s',
+                        '%s'
+                )
+        );
 }
 

trunk/src/class-buddypress.php

@@ -305 +305 @@
 
                 $this->version    = '5.0.0-alpha';
-                $this->db_version = 11105;
+                $this->db_version = 12385;
 
                 /** Loading ***********************************************************/