From 4b1a0825c44b649bb80ca75bb67b13cf0faec1bd Mon Sep 17 00:00:00 2001 From: Brian Miyaji Date: Sun, 20 Sep 2015 21:59:53 +1000 Subject: [PATCH] Add default return value to equation solver --- includes/sp-core-functions.php | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/includes/sp-core-functions.php b/includes/sp-core-functions.php index 25230b04..550b8c00 100644 --- a/includes/sp-core-functions.php +++ b/includes/sp-core-functions.php @@ -1041,20 +1041,20 @@ if ( !function_exists( 'sp_get_eos_safe_slug' ) ) { } if ( !function_exists( 'sp_solve' ) ) { - function sp_solve( $equation, $vars, $precision = 0 ) { + function sp_solve( $equation, $vars, $precision = 0, $default = '-' ) { if ( $equation == null ) - return '-'; + return $default; if ( strpos( $equation, '$gamesback' ) !== false ): // Return placeholder - return '-'; + return $default; elseif ( strpos( $equation, '$streak' ) !== false ): // Return direct value - return sp_array_value( $vars, 'streak', '-' ); + return sp_array_value( $vars, 'streak', $default ); elseif ( strpos( $equation, '$last5' ) !== false ): @@ -1063,7 +1063,7 @@ if ( !function_exists( 'sp_solve' ) ) { if ( array_sum( $last5 ) > 0 ): return implode( '-', $last5 ); else: - return '-'; + return $default; endif; elseif ( strpos( $equation, '$last10' ) !== false ): @@ -1073,7 +1073,7 @@ if ( !function_exists( 'sp_solve' ) ) { if ( array_sum( $last10 ) > 0 ): return implode( '-', $last10 ); else: - return '-'; + return $default; endif; elseif ( strpos( $equation, '$homerecord' ) !== false ): @@ -1097,7 +1097,7 @@ if ( !function_exists( 'sp_solve' ) ) { unset( $vars['last10'] ); if ( sp_array_value( $vars, 'eventsplayed', 0 ) <= 0 ) - return '-'; + return $default; // Equation Operating System if ( ! class_exists( 'phpStack' ) )