Changeset 4041

Timestamp:

02/12/2011 08:50:26 PM (16 years ago)

Author:

djpaul

Message:

Swap some more function_exists calls to bp_is_active. See #2718

Location:

trunk

Files:

• bp-activity/bp-activity-template.php (modified) (2 diffs)
• bp-blogs/bp-blogs-activity.php (modified) (5 diffs)
• bp-blogs/bp-blogs-loader.php (modified) (1 diff)
• bp-core/admin/bp-core-admin.php (modified) (1 diff)
• bp-core/admin/bp-core-update.php (modified) (1 diff)
• bp-core/bp-core-filters.php (modified) (1 diff)
• bp-friends/bp-friends-activity.php (modified) (2 diffs)
• bp-groups/bp-groups-activity.php (modified) (2 diffs)
• bp-members/bp-members-signup.php (modified) (1 diff)
• bp-xprofile/bp-xprofile-classes.php (modified) (1 diff)

trunk/bp-activity/bp-activity-template.php

@@ -293 +293 @@
                         switch ( $scope ) {
                                 case 'friends':
-                                        if ( function_exists( 'friends_get_friend_user_ids' ) )
+                                        if ( bp_is_active( 'friends' ) )
                                                 $friends = friends_get_friend_user_ids( $user_id );
                                                 if ( empty( $friends ) )
@@ -301 +301 @@
                                         break;
                                 case 'groups':
-                                        if ( function_exists( 'groups_get_user_groups' ) ) {
+                                        if ( bp_is_active( 'groups' ) ) {
                                                 $groups = groups_get_user_groups( $user_id );
                                                 if ( empty( $groups['groups'] ) )

trunk/bp-blogs/bp-blogs-activity.php

@@ -9 +9 @@
         global $bp;
 
-        if ( !function_exists( 'bp_activity_set_action' ) )
+        if ( !bp_is_active( 'activity' ) )
                 return false;
 
@@ -23 +23 @@
         global $bp;
 
-        if ( !function_exists( 'bp_activity_add' ) )
+        if ( !bp_is_active( 'activity' ) )
                 return false;
 
@@ -31 +31 @@
          * component globals.
          */
-        if ( !$bp->activity && function_exists('bp_activity_setup_globals') )
+        if ( !$bp->activity && bp_is_active( 'activity' ) )
                 bp_activity_setup_globals();
 
@@ -51 +51 @@
 
         // Remove large images and replace them with just one image thumbnail
-        if ( function_exists( 'bp_activity_thumbnail_content_images' ) && !empty( $content ) )
+        if ( bp_is_active( 'activity' ) && !empty( $content ) )
                 $content = bp_activity_thumbnail_content_images( $content, $primary_link );
 
@@ -75 +75 @@
         global $bp;
 
-        if ( function_exists( 'bp_activity_delete_by_item_id' ) ) {
+        if ( bp_is_active( 'activity' ) ) {
                 $defaults = array(
                         'item_id'           => false,

trunk/bp-blogs/bp-blogs-loader.php

@@ -125 +125 @@
                 if ( bp_is_blogs_component() ) {
                         if ( bp_is_my_profile() ) {
-                                if ( function_exists('xprofile_setup_nav') ) {
+                                if ( bp_is_active( 'xprofile' ) ) {
                                         $bp->bp_options_title = __( 'My Blogs', 'buddypress' );
                                 }

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

@@ -160 +160 @@
                                         </tr>
 
-                                        <?php if ( function_exists( 'bp_forums_setup') ) : ?>
+                                        <?php if ( bp_is_active( 'forums' ) ) : ?>
 
                                                 <tr>

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

@@ -69 +69 @@
                                 $steps[] = __( 'Database Update', 'buddypress' );
 
-                        if ( $this->database_version < 1225 || ( function_exists( 'bp_core_get_page_meta' ) && !bp_core_get_page_meta() ) )
+                        if ( $this->database_version < 1225 || !bp_core_get_page_meta() )
                                 $steps[] = __( 'Pages', 'buddypress' );
 

trunk/bp-core/bp-core-filters.php

@@ -19 +19 @@
                 $pages[] = $bp->pages->register->id;
 
-        if ( !bp_is_active( 'forums' ) || ( function_exists( 'bp_forums_is_installed_correctly' ) && !bp_forums_is_installed_correctly() ) )
+        if ( !bp_is_active( 'forums' ) || ( bp_is_active( 'forums' ) && !bp_forums_is_installed_correctly() ) )
                 if ( !empty( $bp->pages->forums ) )
                         $pages[] = $bp->pages->forums->id;

trunk/bp-friends/bp-friends-activity.php

@@ -9 +9 @@
         global $bp;
 
-        if ( !function_exists( 'bp_activity_add' ) )
+        if ( !bp_is_active( 'activity' ) )
                 return false;
 
@@ -43 +43 @@
         global $bp;
 
-        if ( !function_exists( 'bp_activity_set_action' ) )
+        if ( !bp_is_active( 'activity' ) )
                 return false;
 

trunk/bp-groups/bp-groups-activity.php

@@ -14 +14 @@
         global $bp;
 
-        if ( !function_exists( 'bp_activity_set_action' ) )
+        if ( !bp_is_active( 'activity' ) )
                 return false;
 
@@ -29 +29 @@
         global $bp;
 
-        if ( !function_exists( 'bp_activity_add' ) )
+        if ( !bp_is_active( 'activity' ) )
                 return false;
 

trunk/bp-members/bp-members-signup.php

@@ -496 +496 @@
 
 function bp_members_new_user_activity( $user ) {
-        if ( empty( $user ) || !function_exists( 'bp_activity_add' ) )
+        if ( empty( $user ) || !bp_is_active( 'activity' ) )
                 return false;
 

trunk/bp-xprofile/bp-xprofile-classes.php

@@ -689 +689 @@
                         </div>
 
-                        <?php if ( function_exists( 'wp_nonce_field' ) ) wp_nonce_field( 'xprofile_delete_option' ); ?>
+                        <?php wp_nonce_field( 'xprofile_delete_option' ); ?>
 
                 </form>