Changeset 2695 for trunk/bp-core.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-core.php (modified) (13 diffs)

trunk/bp-core.php

@@ -23 +23 @@
     define( 'BP_ROOT_BLOG', 1 );
 
-/* Define the user and usermeta table names, useful if you are using custom or shared tables */
+/* Define the user and usermeta table names, useful if you are using custom or shared tables. */
 if ( !defined( 'CUSTOM_USER_TABLE' ) )
     define( 'CUSTOM_USER_TABLE', $wpdb->base_prefix . 'users' );
@@ -40 +40 @@
 require ( BP_PLUGIN_DIR . '/bp-core/bp-core-notifications.php' );
 require ( BP_PLUGIN_DIR . '/bp-core/bp-core-signup.php' );
-require ( BP_PLUGIN_DIR . '/bp-core/bp-core-activation.php' );
-
-/* If BP_DISABLE_ADMIN_BAR is defined, do not load the global admin bar */
+
+/* Multisite includes built in account activation support. */
+if ( bp_core_is_multisite() )
+    require ( BP_PLUGIN_DIR . '/bp-core/bp-core-activation.php' );
+
+/* If BP_DISABLE_ADMIN_BAR is defined, do not load the global admin bar. */
 if ( !defined( 'BP_DISABLE_ADMIN_BAR' ) )
     require ( BP_PLUGIN_DIR . '/bp-core/bp-core-adminbar.php' );
@@ -61 +64 @@
 if ( !defined( 'BP_SEARCH_SLUG' ) )
     define( 'BP_SEARCH_SLUG', 'search' );
-
-/* Define the slug for the search page */
-if ( !defined( 'BP_HOME_BLOG_SLUG' ) )
-    define( 'BP_HOME_BLOG_SLUG', 'blog' );
 
 /* Register BuddyPress themes contained within the bp-theme folder */
@@ -142 +141 @@
     }
 
+    /* Fetches all of the core database based BuddyPress settings in one foul swoop */
+    $bp->site_options = bp_core_get_site_options();
+
     /* Sets up the array container for the component navigation rendered by bp_get_nav() */
     $bp->bp_nav = array();
@@ -148 +150 @@
     $bp->bp_options_nav = array();
 
-    /* Sets up container used for the title of the current component option and rendered by bp_get_options_title() */
-    $bp->bp_options_title = '';
-
-    /* Sets up container used for the avatar of the current component being viewed. Rendered by bp_get_options_avatar() */
-    $bp->bp_options_avatar = '';
-
     /* Contains an array of all the active components. The key is the slug, value the internal ID of the component */
     $bp->active_components = array();
 
     /* Fetches the default Gravatar image to use if the user/group/blog has no avatar or gravatar */
-    $bp->grav_default->user = apply_filters( 'bp_user_gravatar_default', get_site_option( 'user-avatar-default' ) );
+    $bp->grav_default->user = apply_filters( 'bp_user_gravatar_default', $bp->site_options['user-avatar-default'] );
     $bp->grav_default->group = apply_filters( 'bp_group_gravatar_default', 'identicon' );
     $bp->grav_default->blog = apply_filters( 'bp_blog_gravatar_default', 'identicon' );
@@ -183 +179 @@
 }
 add_action( 'bp_setup_globals', 'bp_core_setup_globals' );
-add_action( '_admin_menu', 'bp_core_setup_globals', 2 ); // must be _admin_menu hook.
-
 
 /**
@@ -202 +196 @@
     bp_core_add_root_component( BP_ACTIVATION_SLUG );
     bp_core_add_root_component( BP_SEARCH_SLUG );
-    bp_core_add_root_component( BP_HOME_BLOG_SLUG );
 }
 add_action( 'plugins_loaded', 'bp_core_setup_root_uris', 2 );
@@ -274 +267 @@
 
     /* Need to check db tables exist, activate hook no-worky in mu-plugins folder. */
-    if ( get_site_option('bp-core-db-version') < BP_CORE_DB_VERSION )
+    if ( $bp->site_options['bp-core-db-version'] < BP_CORE_DB_VERSION )
         bp_core_install();
 }
@@ -558 +551 @@
     return apply_filters( 'bp_core_get_user_domain', $domain );
 }
-/* DEPRECATED */
-function bp_core_get_userurl( $uid ) { return bp_core_get_user_domain( $uid ); }
 
 /**
@@ -1077 +1068 @@
  * @return str The link text based on passed parameters.
  */
-function bp_core_get_userlink( $user_id, $no_anchor = false, $just_link = false, $deprecated = false, $with_s = false ) {
+function bp_core_get_userlink( $user_id, $no_anchor = false, $just_link = false ) {
     $display_name = bp_core_get_user_displayname( $user_id );
 
@@ -1083 +1074 @@
         return false;
 
-    if ( $with_s )
-        $display_name = sprintf( __( "%s's", 'buddypress' ), $display_name );
-
     if ( $no_anchor )
         return $display_name;
@@ -1095 +1083 @@
         return $url;
 
-    return apply_filters( 'bp_core_get_userlink', '<a href="' . $url . '">' . $display_name . '</a>', $user_id );
+    return apply_filters( 'bp_core_get_userlink', '<a href="' . $url . '" title="' . $display_name . '">' . $display_name . '</a>', $user_id );
 }
 
@@ -1533 +1521 @@
 
     return apply_filters( 'bp_core_get_site_path', $site_path );
+}
+
+/**
+ * bp_core_get_site_options()
+ *
+ * BuddyPress uses site options to store configuration settings. Many of these settings are needed
+ * at run time. Instead of fetching them all and adding many initial queries to each page load, let's fetch
+ * them all in one go.
+ *
+ * @package BuddyPress Core
+ */
+function bp_core_get_site_options() {
+    global $bp, $wpdb;
+
+    $options = apply_filters( 'bp_core_site_options', array(
+        'bp-core-db-version',
+        'bp-activity-db-version',
+        'bp-blogs-db-version',
+        'bp-friends-db-version',
+        'bp-groups-db-version',
+        'bp-messages-db-version',
+        'bp-xprofile-db-version',
+        'bp-deactivated-components',
+        'bp-blogs-first-install',
+        'bp-disable-blog-forum-comments',
+        'bp-xprofile-base-group-name',
+        'bp-xprofile-fullname-field-name',
+        'bp-hide-loggedout-adminbar',
+        'bp-disable-profile-sync',
+        'bp-disable-avatar-uploads',
+        'bp-disable-account-deletion',
+        'bp-disable-forum-directory',
+        'bp-disable-blogforum-comments',
+        'bb-config-location',
+
+        /* Useful WordPress settings used often */
+        'user-avatar-default',
+        'tags_blog_id',
+        'registration',
+        'fileupload_maxk'
+    ) );
+
+    $meta_keys = "'" . implode( "','", (array)$options ) ."'";
+
+    if ( bp_core_is_multisite() )
+        $meta = $wpdb->get_results( "SELECT meta_key AS name, meta_value AS value FROM {$wpdb->sitemeta} WHERE meta_key IN ({$meta_keys})" );
+    else
+        $meta = $wpdb->get_results( "SELECT option_name AS name, option_value AS value FROM {$wpdb->options} WHERE option_name IN ({$meta_keys})" );
+
+    $site_options = array();
+    if ( !empty( $meta ) ) {
+        foreach( (array)$meta as $meta_item )
+            $site_options[$meta_item->name] = $meta_item->value;
+    }
+
+    return apply_filters( 'bp_core_get_site_options', $site_options );
 }