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

Prevent league table failure

Browse Source
This commit is contained in:
Brian Miyaji
2014-02-08 14:11:43 +11:00
parent c54bbade6d
commit bdbbfbb1e3
1 changed files with 9 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
functions.php
View File

@@ -1150,12 +1150,12 @@ if ( !function_exists( 'sportspress_get_eos_safe_slug' ) ) {
if ( !function_exists( 'sportspress_solve' ) ) { if ( !function_exists( 'sportspress_solve' ) ) {
function sportspress_solve( $equation, $vars ) { function sportspress_solve( $equation, $vars ) {
if ( str_replace( ' ', '', $equation ) == '$streak' ): if ( strpos( $equation, '$streak' ) !== false ):
// Return direct value // Return direct value
return sportspress_array_value( $vars, 'streak', 0 ); return sportspress_array_value( $vars, 'streak', 0 );
elseif ( str_replace( ' ', '', $equation ) == '$last5' ): elseif ( strpos( $equation, '$last5' ) !== false ):
// Return imploded string // Return imploded string
$last5 = sportspress_array_value( $vars, 'last5', array( 0 ) ); $last5 = sportspress_array_value( $vars, 'last5', array( 0 ) );
@@ -1165,7 +1165,7 @@ if ( !function_exists( 'sportspress_solve' ) ) {
return '—'; return '—';
endif; endif;
elseif ( str_replace( ' ', '', $equation ) == '$last10' ): elseif ( strpos( $equation, '$last10' ) !== false ):
// Return imploded string // Return imploded string
$last10 = sportspress_array_value( $vars, 'last10', array( 0 ) ); $last10 = sportspress_array_value( $vars, 'last10', array( 0 ) );
@@ -1179,10 +1179,14 @@ if ( !function_exists( 'sportspress_solve' ) ) {
// Remove unnecessary variables from vars before calculating // Remove unnecessary variables from vars before calculating
unset( $vars['streak'] ); unset( $vars['streak'] );
unset( $vars['last5'] );
unset( $vars['last10'] ); unset( $vars['last10'] );
endif; endif;
if ( sportspress_array_value( $vars, 'eventsplayed', 0 ) <= 0 )
return '&mdash;';
// Clearance to begin calculating remains true if all equation variables are in vars // Clearance to begin calculating remains true if all equation variables are in vars
$clearance = true; $clearance = true;
@@ -1444,11 +1448,7 @@ if ( !function_exists( 'sportspress_get_team_columns_data' ) ) {
// Generate array of placeholder values for each league // Generate array of placeholder values for each league
$placeholders[ $div_id ] = array(); $placeholders[ $div_id ] = array();
foreach ( $equations as $key => $value ): foreach ( $equations as $key => $value ):
if ( $totals['eventsplayed'] > 0 ): $placeholders[ $div_id ][ $key ] = sportspress_solve( $value, $totals );
$placeholders[ $div_id ][ $key ] = sportspress_solve( $value, $totals );
else:
$placeholders[ $div_id ][ $key ] = 0;
endif;
endforeach; endforeach;
endforeach; endforeach;
@@ -1717,11 +1717,7 @@ if ( !function_exists( 'sportspress_get_league_table_data' ) ) {
foreach ( $stats as $stat ): foreach ( $stats as $stat ):
if ( sportspress_array_value( $placeholders[ $team_id ], $stat->post_name, '' ) == '' ): if ( sportspress_array_value( $placeholders[ $team_id ], $stat->post_name, '' ) == '' ):
if ( sizeof( $events ) > 0 ): $placeholders[ $team_id ][ $stat->post_name ] = sportspress_solve( $stat->equation, sportspress_array_value( $totals, $team_id, array() ) );
$placeholders[ $team_id ][ $stat->post_name ] = sportspress_solve( $stat->equation, sportspress_array_value( $totals, $team_id, array() ) );
else:
$placeholders[ $team_id ][ $stat->post_name ] = 0;
endif;
endif; endif;
endforeach; endforeach;
endforeach; endforeach;