asc/sportspress
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/ThemeBoy/SportsPress

Browse Source
This commit is contained in:
Brian Miyaji
2020-08-27 23:09:01 +10:00
parent 9fbe63269c 8bf77c69a0
commit 54af25e059
3 changed files with 23 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
includes/class-sp-player-list.php
View File

@@ -374,6 +374,24 @@ class SP_Player_List extends SP_Secondary_Post {
'terms' => $season_ids
);
endif;
$team_key = 'sp_team';
if ( $team ):
switch ( $era ):
case 'current':
$team_key = 'sp_current_team';
break;
case 'past':
$team_key = 'sp_past_team';
break;
endswitch;
$args['meta_query'][] = array(
array(
'key' => $team_key,
'value' => $team
),
);
endif;
if ( $this->date !== 0 ):
if ( $this->date == 'w' ):
@@ -412,6 +430,7 @@ class SP_Player_List extends SP_Secondary_Post {
// Add all team performance
if ( is_array( $team_performance ) ): foreach ( $team_performance as $team_id => $players ):
if ( $team && $team_id != $team ) continue;
if ( is_array( $players ) ): foreach ( $players as $player_id => $player_performance ):
if ( array_key_exists( $player_id, $totals ) && is_array( $totals[ $player_id ] ) ):

10
includes/class-sp-player.php
View File

@@ -802,13 +802,9 @@ class SP_Player extends SP_Custom_Post {
$labels = array();
if ( 'no' === get_option( 'sportspress_player_show_statistics', 'yes' ) ) {
$merged = array();
} else {
$labels['name'] = __( 'Season', 'sportspress' );
$labels['team'] = __( 'Team', 'sportspress' );
}
$labels['name'] = __( 'Season', 'sportspress' );
$labels['team'] = __( 'Team', 'sportspress' );
if ( 'no' === get_option( 'sportspress_player_show_total', 'no' ) ) {
unset( $merged[-1] );
}