Skip to:
Content

BuddyPress.org

Changeset 380


Ignore:
Timestamp:
10/09/2008 07:18:50 AM (17 years ago)
Author:
apeatling
Message:

Updated widget functions to fix item ordering.

Location:
trunk
Files:
4 edited

Legend:

Unmodified
Added
Removed

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

    r375 r380  
    8585            $limit = 5;
    8686           
    87         return $wpdb->get_results( $wpdb->prepare( "SELECT ID as user_id, user_registered FROM {$wpdb->base_prefix}users WHERE spam = 0 AND deleted = 0 AND user_status = 0 ORDER BY user_registered DESC LIMIT %d", $limit ) );
     87        return $wpdb->get_results( $wpdb->prepare( "SELECT ID as user_id, user_registered FROM {$wpdb->base_prefix}users WHERE spam = 0 AND deleted = 0 AND user_status = 0 ORDER BY CONVERT(user_registered, DATETIME) DESC LIMIT %d", $limit ) );
    8888    }
    8989   
    … …  
    9191        global $wpdb;
    9292       
     93        var_dump($limit);
     94       
    9395        if ( !$limit )
    9496            $limit = 5;
    9597           
    96         return $wpdb->get_results( $wpdb->prepare( "SELECT user_id FROM {$wpdb->base_prefix}usermeta um WHERE meta_key = 'last_activity' ORDER BY meta_value DESC LIMIT %d", $limit ) );
     98        return $wpdb->get_results( $wpdb->prepare( "SELECT user_id FROM {$wpdb->base_prefix}usermeta um WHERE meta_key = 'last_activity' ORDER BY FROM_UNIXTIME(meta_value) DESC LIMIT %d", $limit ) );
    9799    }
    98100
    … …  
    106108            $limit = 5;
    107109
    108         return $wpdb->get_results( $wpdb->prepare( "SELECT user_id FROM {$wpdb->base_prefix}usermeta um WHERE meta_key = 'total_friend_count' ORDER BY meta_value DESC LIMIT %d", $limit ) );
     110        return $wpdb->get_results( $wpdb->prepare( "SELECT user_id FROM {$wpdb->base_prefix}usermeta um WHERE meta_key = 'total_friend_count' ORDER BY CONVERT(meta_value, SIGNED) DESC LIMIT %d", $limit ) );
    109111    }
    110112   
    … …  
    115117            $limit = 5;
    116118
    117         return $wpdb->get_results( $wpdb->prepare( "SELECT user_id FROM {$wpdb->base_prefix}usermeta um WHERE meta_key = 'last_activity' AND DATE_ADD( FROM_UNIXTIME(meta_value), INTERVAL 5 MINUTE ) >= NOW() ORDER BY meta_value DESC LIMIT %d", $limit ) );     
     119        return $wpdb->get_results( $wpdb->prepare( "SELECT user_id FROM {$wpdb->base_prefix}usermeta um WHERE meta_key = 'last_activity' AND DATE_ADD( FROM_UNIXTIME(meta_value), INTERVAL 5 MINUTE ) >= NOW() ORDER BY FROM_UNIXTIME(meta_value) DESC LIMIT %d", $limit ) );       
    118120    }
    119121}

  • trunk/bp-groups.php

    r379 r380  
    33
    44define ( 'BP_GROUPS_IS_INSTALLED', 1 );
    5 define ( 'BP_GROUPS_VERSION', '0.1.9' );
     5define ( 'BP_GROUPS_VERSION', '0.1.9.1' );
    66
    77include_once( 'bp-groups/bp-groups-classes.php' );
    … …  
    9696 **************************************************************************/
    9797
    98 function groups_setup_globals( $global = true ) {
     98function groups_setup_globals( $no_global = false ) {
    9999    global $wpdb;
    100100   
    101     if ( $global )
     101    if ( !$no_global )
    102102        global $bp;
    103103   
    … …  
    118118    return $bp;
    119119}
    120 add_action( 'wp', 'groups_setup_globals', 1 ); 
    121 add_action( '_admin_menu', 'groups_setup_globals', 1 );
     120add_action( 'wp', 'groups_setup_globals', 1, false );   
     121add_action( '_admin_menu', 'groups_setup_globals', 1, false );
    122122
    123123
    … …  
    236236    // We have to set up the globals to use manually.
    237237    bp_core_set_uri_globals();
    238     $groups_bp = groups_setup_globals(false);
     238    $groups_bp = groups_setup_globals(true);
    239239   
    240240    if ( $current_component == $groups_bp['groups']['slug'] )

  • trunk/bp-groups/bp-groups-classes.php

    r375 r380  
    334334            $limit = 5;
    335335
    336         return $wpdb->get_results( $wpdb->prepare( "SELECT group_id FROM " . $bp['groups']['table_name_groupmeta'] . " WHERE meta_key = 'last_activity' ORDER BY meta_value DESC LIMIT %d", $limit ) );
     336        return $wpdb->get_results( $wpdb->prepare( "SELECT group_id FROM " . $bp['groups']['table_name_groupmeta'] . " WHERE meta_key = 'last_activity' ORDER BY CONVERT(meta_value, SIGNED) DESC LIMIT %d", $limit ) );
    337337    }
    338338   
    … …  
    343343            $limit = 5;
    344344
    345         return $wpdb->get_results( $wpdb->prepare( "SELECT group_id FROM " . $bp['groups']['table_name_groupmeta'] . " WHERE meta_key = 'total_member_count' ORDER BY meta_value DESC LIMIT %d", $limit ) );
     345        return $wpdb->get_results( $wpdb->prepare( "SELECT group_id FROM " . $bp['groups']['table_name_groupmeta'] . " WHERE meta_key = 'total_member_count' ORDER BY CONVERT(meta_value, SIGNED) DESC LIMIT %d", $limit ) );
    346346    }
    347347}

  • trunk/bp-groups/bp-groups-widgets.php

    r375 r380  
    3333        . $after_title; ?>
    3434   
    35     <?php $groups = BP_Groups_Group::get_newest( $options['max_groups'] ); ?>
     35    <?php $groups = groups_get_popular( $options['max_groups'] ); ?>
    3636   
    3737    <?php if ( $groups ) : ?>
    3838        <div class="item-options" id="groups-list-options">
    3939            <img id="ajax-loader-groups" src="<?php echo $bp['groups']['image_base'] ?>/ajax-loader.gif" height="7" alt="Loading" style="display: none;" /> &nbsp;
    40             <a href="<?php echo site_url() . '/groups' ?>" id="newest-groups" class="selected"><?php _e("Newest") ?></a> |
     40            <a href="<?php echo site_url() . '/groups' ?>" id="newest-groups"><?php _e("Newest") ?></a> |
    4141            <a href="<?php echo site_url() . '/groups' ?>" id="recently-active-groups"><?php _e("Active") ?></a> |
    42             <a href="<?php echo site_url() . '/groups' ?>" id="popular-groups"><?php _e("Popular") ?></a>
     42            <a href="<?php echo site_url() . '/groups' ?>" id="popular-groups" class="selected"><?php _e("Popular") ?></a>
    4343        </div>
    4444        <ul id="groups-list" class="item-list">
    … …  
    5252                    <div class="item">
    5353                        <div class="item-title"><a href="<?php echo bp_group_permalink( $group ) ?>" title="<?php echo $group->name ?>"><?php echo $group->name ?></a></div>
    54                         <div class="item-meta"><span class="activity"><?php echo bp_core_get_last_activity( $group->date_created, __('created '), __(' ago') ) ?></span></div>
     54                        <div class="item-meta">
     55                        <span class="activity">
     56                            <?php
     57                            if ( $group->total_member_count == 1 )
     58                                echo $group->total_member_count . __(' member');
     59                            else
     60                                echo $group->total_member_count . __(' members');
     61                            ?>
     62                        </span></div>
    5563                    </div>
    5664                </li>
Note: See TracChangeset for help on using the changeset viewer.