Changeset 2695 for trunk/bp-xprofile.php

Timestamp:

02/12/2010 12:31:49 PM (15 years ago)

Author:

apeatling

Message:

Fixing the use of deprecated template tags in bp-default. Merged the fetching of BP runtime settings into one query to significantly reduce the number of run time database hits. Fixed #1916

File:

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

trunk/bp-xprofile.php

@@ -12 +12 @@
 require ( BP_PLUGIN_DIR . '/bp-xprofile/bp-xprofile-cssjs.php' );
 
-/* Assign the base group and fullname field names to constants to use in SQL statements */
-define ( 'BP_XPROFILE_BASE_GROUP_NAME', get_site_option( 'bp-xprofile-base-group-name' ) );
-define ( 'BP_XPROFILE_FULLNAME_FIELD_NAME', get_site_option( 'bp-xprofile-fullname-field-name' ) );
-
 /**
  * xprofile_install()
@@ -32 +28 @@
         $charset_collate = "DEFAULT CHARACTER SET $wpdb->charset";
 
-    if ( '' == get_site_option( 'bp-xprofile-base-group-name' ) )
+    if ( empty( $bp->option['bp-xprofile-base-group-name'] ) )
         update_site_option( 'bp-xprofile-base-group-name', 'Base' );
 
-    if ( '' == get_site_option( 'bp-xprofile-fullname-field-name' ) )
+    if ( empty( $bp->option['bp-xprofile-fullname-field-name'] ) )
         update_site_option( 'bp-xprofile-fullname-field-name', 'Name' );
 
@@ -76 +72 @@
     ) {$charset_collate};";
 
-    if ( '' == get_site_option( 'bp-xprofile-db-version' ) ) {
+    if ( empty( $bp->option['bp-xprofile-db-version'] ) ) {
         if ( !$wpdb->get_var( "SELECT id FROM {$bp->profile->table_name_groups} WHERE id = 1" ) )
-            $sql[] = "INSERT INTO {$bp->profile->table_name_groups} VALUES ( 1, '" . get_site_option( 'bp-xprofile-base-group-name' ) . "', '', 0 );";
+            $sql[] = "INSERT INTO {$bp->profile->table_name_groups} VALUES ( 1, '" . $bp->option['bp-xprofile-base-group-name'] . "', '', 0 );";
 
         if ( !$wpdb->get_var( "SELECT id FROM {$bp->profile->table_name_fields} WHERE id = 1" ) ) {
@@ -84 +80 @@
                         id, group_id, parent_id, type, name, is_required, can_delete
                       ) VALUES (
-                        1, 1, 0, 'textbox', '" . get_site_option( 'bp-xprofile-fullname-field-name' ) . "', 1, 0
+                        1, 1, 0, 'textbox', '" . $bp->option['bp-xprofile-fullname-field-name'] . "', 1, 0
                       );";
         }
@@ -110 +106 @@
     global $bp, $wpdb;
 
+    /* Assign the base group and fullname field names to constants to use in SQL statements */
+    define ( 'BP_XPROFILE_BASE_GROUP_NAME', $bp->site_options['bp-xprofile-base-group-name'] );
+    define ( 'BP_XPROFILE_FULLNAME_FIELD_NAME', $bp->site_options['bp-xprofile-fullname-field-name'] );
+
     /* For internal identification */
     $bp->profile->id = 'profile';
@@ -129 +129 @@
 }
 add_action( 'bp_setup_globals', 'xprofile_setup_globals' );
-add_action( 'admin_menu', 'xprofile_setup_globals', 2 );
 
 /**
@@ -157 +156 @@
 
     /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
-    if ( get_site_option('bp-xprofile-db-version') < BP_XPROFILE_DB_VERSION )
+    if ( $bp->option['bp-xprofile-db-version'] < BP_XPROFILE_DB_VERSION )
         xprofile_install();
 }
@@ -868 +867 @@
     global $bp, $wpdb;
 
-    if ( (int)get_site_option( 'bp-disable-profile-sync' ) )
+    if ( (int)$bp->option['bp-disable-profile-sync'] )
         return true;