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

Fix merged array generator in sp_get_list

Browse Source
This commit is contained in:
ThemeBoy
2013-12-04 04:23:52 +11:00
parent e26b71b135
commit dade2a2ee1
1 changed files with 7 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sportspress-functions.php
View File

@@ -987,7 +987,7 @@ if ( !function_exists( 'sp_get_list' ) ) {
$eos = new eqEOS(); $eos = new eqEOS();
// Get labels from result variables // Get labels from result variables
$metric_labels = (array)sp_get_var_labels( 'sp_metric' ); $columns = (array)sp_get_var_labels( 'sp_metric' );
// Get all divisions populated with stats where available // Get all divisions populated with stats where available
$data = sp_array_combine( $player_ids, $stats ); $data = sp_array_combine( $player_ids, $stats );
@@ -1005,7 +1005,7 @@ if ( !function_exists( 'sp_get_list' ) ) {
$totals[ $player_id ] = array( 'eventsattended' => 0, 'eventsplayed' => 0 ); $totals[ $player_id ] = array( 'eventsattended' => 0, 'eventsplayed' => 0 );
foreach ( $metric_labels as $key => $value ): foreach ( $columns as $key => $value ):
$totals[ $player_id ][ $key ] = 0; $totals[ $player_id ][ $key ] = 0;
endforeach; endforeach;
@@ -1104,8 +1104,8 @@ if ( !function_exists( 'sp_get_list' ) ) {
foreach( $player_data as $key => $value ): foreach( $player_data as $key => $value ):
// Use static data if key exists and value is not empty, else use placeholder // Use static data if key exists and value is not empty, else use placeholder
if ( array_key_exists( $player_id, $tempdata ) && array_key_exists( $key, $tempdata[ $player_id ] ) && $tempdata[ $player_id ][ $key ] != '' ): if ( array_key_exists( $player_id, $data ) && array_key_exists( $key, $data[ $player_id ] ) && $data[ $player_id ][ $key ] != '' ):
$merged[ $player_id ][ $key ] = $tempdata[ $player_id ][ $key ]; $merged[ $player_id ][ $key ] = $data[ $player_id ][ $key ];
else: else:
$merged[ $player_id ][ $key ] = $value; $merged[ $player_id ][ $key ] = $value;
endif; endif;
@@ -1114,10 +1114,10 @@ if ( !function_exists( 'sp_get_list' ) ) {
endforeach; endforeach;
if ( $breakdown ): if ( $breakdown ):
return array( $metric_labels, $data, $placeholders, $merged ); return array( $columns, $data, $placeholders, $merged );
else: else:
array_unshift( $metric_labels, __( 'Player', 'sportspress' ) ); array_unshift( $columns, __( 'Player', 'sportspress' ) );
$merged[0] = $metric_labels; $merged[0] = $columns;
return $merged; return $merged;
endif; endif;
} }