Changeset 3260 for branches/1.2/bp-core/bp-core-widgets.php

Timestamp:

09/13/2010 01:08:31 AM (14 years ago)

Author:

johnjamesjacoby

Message:

Committing patch from #2566 for easier review and testing. Adds BP_Button class and associated template tags. Also includes code formatting fixes, phpdoc, widget fixes when friends component is disabled, and possibly the kitchen sink.

File:

• branches/1.2/bp-core/bp-core-widgets.php (modified) (5 diffs)

branches/1.2/bp-core/bp-core-widgets.php

@@ -22 +22 @@
         global $bp;
 
-        extract( $args );
+        extract( $args );
 
         echo $before_widget;
@@ -32 +32 @@
             <div class="item-options" id="members-list-options">
                 <span class="ajax-loader" id="ajax-loader-members"></span>
-                <a href="<?php echo site_url() . '/' . BP_MEMBERS_SLUG ?>" id="newest-members" class="selected"><?php _e( 'Newest', 'buddypress' ) ?></a> |
-                <a href="<?php echo site_url() . '/' . BP_MEMBERS_SLUG ?>" id="recently-active-members"><?php _e( 'Active', 'buddypress' ) ?></a> |
-                <a href="<?php echo site_url() . '/' . BP_MEMBERS_SLUG ?>" id="popular-members"><?php _e( 'Popular', 'buddypress' ) ?></a>
+                <a href="<?php echo site_url() . '/' . BP_MEMBERS_SLUG ?>" id="newest-members" class="selected"><?php _e( 'Newest', 'buddypress' ) ?></a>
+                |  <a href="<?php echo site_url() . '/' . BP_MEMBERS_SLUG ?>" id="recently-active-members"><?php _e( 'Active', 'buddypress' ) ?></a>
+
+                <?php if ( bp_is_active( 'friends' ) ) : ?>
+
+                    | <a href="<?php echo site_url() . '/' . BP_MEMBERS_SLUG ?>" id="popular-members"><?php _e( 'Popular', 'buddypress' ) ?></a>
+
+                <?php endif; ?>
+
             </div>
 
@@ -148 +154 @@
         global $bp;
 
-        extract( $args );
+        extract( $args );
 
         echo $before_widget;
@@ -202 +208 @@
         case 'newest-members':
             $type = 'newest';
-        break;
+            break;
+
         case 'recently-active-members':
             $type = 'active';
-        break;
+            break;
+
         case 'popular-members':
-            $type = 'popular';
-        break;
+            if ( bp_is_active( 'friends' ) )
+                $type = 'popular';
+            else
+                $type = 'active';
+
+            break;
     }
 
@@ -224 +236 @@
                         <?php if ( 'active' == $type || 'newest' == $type ) : ?>
                             <div class="item-meta"><span class="activity"><?php bp_member_last_active() ?></span></div>
-                        <?php else : ?>
+                        <?php elseif ( bp_is_active( 'friends' ) ) : ?>
                             <div class="item-meta"><span class="activity"><?php bp_member_total_friend_count() ?></span></div>
                         <?php endif; ?>