Skip to:
Content

Changeset 6606


Ignore:
Timestamp:
12/10/12 14:04:33 (17 months ago)
Author:
johnjamesjacoby
Message:

Add .min scripts for Groups Admin. Fix bug in min filenames. Fixes #4617.

Location:
trunk/bp-groups
Files:
2 added
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/bp-groups/admin/js/admin.js

    r6267 r6606  
    2222            open:      function() { $(this).addClass('open'); }, 
    2323            close:     function() { $(this).removeClass('open'); $(this).val(''); }, 
    24             select:    function( event, ui ) { add_member_to_list( event, ui ); }, 
    25  
     24            select:    function( event, ui ) { add_member_to_list( event, ui ); } 
    2625        }); 
    2726         
  • trunk/bp-groups/bp-groups-admin.php

    r6467 r6606  
    5454 */ 
    5555function bp_groups_admin_load() { 
    56     global $bp, $bp_groups_list_table; 
     56    global $bp_groups_list_table; 
    5757 
    5858    // Build redirection URL 
     
    6060 
    6161    // Decide whether to load the dev version of the CSS and JavaScript 
    62     $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : '.min'; 
     62    $min = defined( 'SCRIPT_DEBUG' ) && SCRIPT_DEBUG ? '' : 'min.'; 
    6363 
    6464    // Decide whether to load the index or edit screen 
     
    233233        if ( ! empty( $user_names ) ) { 
    234234 
    235             foreach( $user_names as $user_key => $user_name ) { 
     235            foreach( array_values( $user_names ) as $user_name ) { 
    236236                $un = trim( $user_name ); 
    237237 
     
    398398 * Display the single groups edit screen 
    399399 * 
    400  * @global int $screen_layout_columns Number of columns shown on this admin page 
    401400 * @since 1.7 
    402401 */ 
    403402function bp_groups_admin_edit() { 
    404     global $screen_layout_columns; 
    405403 
    406404    if ( ! is_super_admin() ) 
     
    459457 
    460458    // Call an action for plugins to modify the group before we display the edit form 
    461     do_action_ref_array( 'bp_groups_admin_edit', array( &$group ) ); 
    462 ?> 
     459    do_action_ref_array( 'bp_groups_admin_edit', array( &$group ) ); ?> 
    463460 
    464461    <div class="wrap"> 
     
    891888 */ 
    892889class BP_Groups_List_Table extends WP_List_Table { 
     890 
    893891    /** 
    894892     * What type of view is being displayed? e.g. "All", "Pending", "Approved", "Spam"... 
     
    979977        $this->group_type_ids = BP_Groups_Group::get_group_type_ids(); 
    980978 
     979        // Pass a dummy array if there are no groups of this type 
    981980        $include = false; 
    982981        if ( 'all' != $this->view && isset( $this->group_type_ids[ $this->view ] ) ) { 
    983             // Pass a dummy array if there are no groups of this type 
    984982            $include = ! empty( $this->group_type_ids[ $this->view ] ) ? $this->group_type_ids[ $this->view ] : array( 0 ); 
    985983        } 
     
    10561054        extract( $this->_args ); 
    10571055 
    1058         $this->display_tablenav( 'top' ); 
    1059     ?> 
     1056        $this->display_tablenav( 'top' ); ?> 
    10601057 
    10611058        <table class="<?php echo implode( ' ', $this->get_table_classes() ); ?>" cellspacing="0"> 
     
    10891086    function single_row( $item ) { 
    10901087        static $row_class = ''; 
    1091         $row_class = ( $row_class == '' ? ' class="alternate"' : '' ); 
     1088 
     1089        if ( empty( $row_class ) ) { 
     1090            $row_class = ( $row_class == '' ) ? ' class="alternate"' : ''; 
     1091        } 
    10921092 
    10931093        echo '<tr' . $row_class . ' id="activity-' . esc_attr( $item['id'] ) . '" data-parent_id="' . esc_attr( $item['id'] ) . '" data-root_id="' . esc_attr( $item['id'] ) . '">'; 
     
    11021102     */ 
    11031103    function get_views() { 
    1104         $url_base = remove_query_arg( array( 'orderby', 'order', 'group_status' ), $_SERVER['REQUEST_URI'] ); 
    1105         //$redirect_to = remove_query_arg( array( 'activity_status', 'aid', 'deleted', 'error', 'spammed', 'unspammed', 'updated', ), $_SERVER['REQUEST_URI'] ); 
    1106     ?> 
     1104        $url_base = remove_query_arg( array( 'orderby', 'order', 'group_status' ), $_SERVER['REQUEST_URI'] ); ?> 
    11071105        <ul class="subsubsub"> 
    11081106            <li class="all"><a href="<?php echo esc_attr( esc_url( $url_base ) ); ?>" class="<?php if ( 'all' == $this->view ) echo 'current'; ?>"><?php _e( 'All', 'buddypress' ); ?></a> |</li> 
Note: See TracChangeset for help on using the changeset viewer.