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

includes/class-sp-player-list.php

@@ -375,6 +375,24 @@ class SP_Player_List extends SP_Secondary_Post {
 			);
 		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' ):
 				$args['year'] = date_i18n('Y');
@@ -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 ] ) ):
 

includes/class-sp-player.php

@@ -802,12 +802,8 @@ 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' );
-			}
 			
 			if ( 'no' === get_option( 'sportspress_player_show_total', 'no' ) ) {
 				unset( $merged[-1] );

templates/event-blocks.php

@@ -172,7 +172,7 @@ if ( $title )
 					<tr class="sp-row sp-post<?php echo ( $i % 2 == 0 ? ' alternate' : '' ); ?>" itemscope itemtype="http://schema.org/SportsEvent">
 						<td>
 							<?php do_action( 'sportspress_event_blocks_before', $event, $usecolumns ); ?>
-							<?php echo implode( $logos, ' ' ); ?>
+							<?php echo implode( ' ', $logos ); ?>
 							<time class="sp-event-date" datetime="<?php echo $event->post_date; ?>" itemprop="startDate" content="<?php echo mysql2date( 'Y-m-d\TH:iP', $event->post_date ); ?>">
 								<?php echo sp_add_link( get_the_time( get_option( 'date_format' ), $event ), $permalink, $link_events ); ?>
 							</time>