Changeset 3450

Timestamp:

11/19/2010 07:53:41 PM (14 years ago)

Author:

djpaul

Message:

Update alot of old-style component checks. Partial fix for #2718.

Location:

trunk

Files:

• bp-core/bp-core-classes.php (modified) (1 diff)
• bp-core/bp-core-templatetags.php (modified) (1 diff)
• bp-forums.php (modified) (2 diffs)

trunk/bp-core/bp-core-classes.php

@@ -167 +167 @@
         }
 
-        if ( $search_terms && function_exists( 'xprofile_install' ) ) {
+        if ( $search_terms && bp_is_active( 'xprofile' ) ) {
             $search_terms = like_escape( $wpdb->escape( $search_terms ) );
             $sql['where_searchterms'] = "AND pd.value LIKE '%%$search_terms%%'";

trunk/bp-core/bp-core-templatetags.php

@@ -990 +990 @@
     global $bp;
 
-    if ( function_exists( 'xprofile_install' )
-         || function_exists( 'groups_install' )
-         || ( function_exists( 'bp_blogs_install' ) && is_multisite() )
+    if ( bp_is_active( 'xprofile' )
+         || bp_is_active( 'groups' )
+         || ( bp_is_active( 'blogs' ) && is_multisite() )
          || ( function_exists( 'bp_forums_setup' ) && !(int)$bp->site_options['bp-disable-forum-directory'] )
         ) {

trunk/bp-forums.php

@@ -393 +393 @@
 
     /* Fetch fullname for the topic's last poster */
-    if ( function_exists( 'xprofile_install' ) ) {
+    if ( bp_is_active( 'xprofile' ) ) {
         $poster_names = $wpdb->get_results( $wpdb->prepare( "SELECT t.topic_id, pd.value FROM {$bp->profile->table_name_data} pd, {$bbdb->topics} t WHERE pd.user_id = t.topic_last_poster AND pd.field_id = 1 AND t.topic_id IN ( {$topic_ids} )" ) );
         for ( $i = 0; $i < count( $topics ); $i++ ) {
@@ -511 +511 @@
 
     /* Fetch fullname for each poster. */
-    if ( function_exists( 'xprofile_install' ) ) {
+    if ( bp_is_active( 'xprofile' ) ) {
         $poster_names = $wpdb->get_results( $wpdb->prepare( "SELECT pd.user_id, pd.value FROM {$bp->profile->table_name_data} pd WHERE pd.user_id IN ( {$user_ids} )" ) );
         for ( $i = 0; $i < count( $posts ); $i++ ) {