From ce9389ba9851a93c06deaf4961de6dc8010e562e Mon Sep 17 00:00:00 2001 From: Nabil Kadimi Date: Wed, 27 Jun 2018 13:28:45 +0100 Subject: [PATCH 1/6] Apply "Reverse Teams" to event logos --- templates/event-logos.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/templates/event-logos.php b/templates/event-logos.php index 392c4a72..4322337f 100644 --- a/templates/event-logos.php +++ b/templates/event-logos.php @@ -15,6 +15,10 @@ if ( ! isset( $id ) ) $teams = (array) get_post_meta( $id, 'sp_team' ); $teams = array_filter( $teams, 'sp_filter_positive' ); +$reverse_teams = get_option( 'sportspress_event_reverse_teams', 'no' ) === 'yes' ? true : false; +if ( $reverse_teams ) { + $teams = array_reverse( $teams ); +} if ( ! $teams ) return; @@ -46,4 +50,4 @@ sp_get_template( 'event-logos-' . $layout . '.php', array( 'link_teams' => $link_teams, ) ); -do_action( 'sportspress_after_event_logos', $id ); \ No newline at end of file +do_action( 'sportspress_after_event_logos', $id ); From c0cd1b212f1fa0272528e4769a83578e824b6b37 Mon Sep 17 00:00:00 2001 From: Nabil Kadimi Date: Thu, 28 Jun 2018 00:24:02 +0100 Subject: [PATCH 2/6] Apply "Reverse Teams" to event logos --- templates/event-logos.php | 3 +++ 1 file changed, 3 insertions(+) diff --git a/templates/event-logos.php b/templates/event-logos.php index 4322337f..31bd41ed 100644 --- a/templates/event-logos.php +++ b/templates/event-logos.php @@ -31,6 +31,9 @@ $link_teams = get_option( 'sportspress_link_teams', 'no' ) === 'yes' ? true : fa if ( $show_results ) { $results = sp_get_main_results( $id ); + if ( $reverse_teams ) { + $results = array_reverse( $results ); + } if ( empty( $results ) ) { $show_results = false; } else { From c44ed5ecf38f5ff1c11518dafc913fa370951136 Mon Sep 17 00:00:00 2001 From: Nabil Kadimi Date: Thu, 28 Jun 2018 10:08:12 +0100 Subject: [PATCH 3/6] Move fix to parent function `sp_get_main_results()` --- templates/event-logos.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/templates/event-logos.php b/templates/event-logos.php index 31bd41ed..4322337f 100644 --- a/templates/event-logos.php +++ b/templates/event-logos.php @@ -31,9 +31,6 @@ $link_teams = get_option( 'sportspress_link_teams', 'no' ) === 'yes' ? true : fa if ( $show_results ) { $results = sp_get_main_results( $id ); - if ( $reverse_teams ) { - $results = array_reverse( $results ); - } if ( empty( $results ) ) { $show_results = false; } else { From 17aa824f562f1a6229781abb785ad8a78cdcb3ad Mon Sep 17 00:00:00 2001 From: Nabil Kadimi Date: Thu, 28 Jun 2018 10:12:45 +0100 Subject: [PATCH 4/6] Move fix to parent function `sp_get_main_results()` --- includes/sp-api-functions.php | 9 ++++++++- 1 file changed, 8 insertions(+), 1 deletion(-) diff --git a/includes/sp-api-functions.php b/includes/sp-api-functions.php index ed2e6105..4207ef89 100644 --- a/includes/sp-api-functions.php +++ b/includes/sp-api-functions.php @@ -111,7 +111,14 @@ function sp_get_main_result_option() { function sp_get_main_results( $post = 0 ) { $event = new SP_Event( $post ); - return $event->main_results(); + $results = $event->main_results(); + if ( is_array( $results ) ) { + $reverse_teams = get_option( 'sportspress_event_reverse_teams', 'no' ) === 'yes' ? true : false; + if ( $reverse_teams ) { + $results = array_reverse( $results ); + } + } + return $results; } function sp_the_main_results( $post = 0, $delimiter = '-' ) { From 995f53256e0f1a32f31aadac643c95749ad3dcd9 Mon Sep 17 00:00:00 2001 From: Nabil Kadimi Date: Thu, 28 Jun 2018 10:16:47 +0100 Subject: [PATCH 5/6] Refactor --- includes/sp-api-functions.php | 7 ++----- 1 file changed, 2 insertions(+), 5 deletions(-) diff --git a/includes/sp-api-functions.php b/includes/sp-api-functions.php index 4207ef89..7bdb814a 100644 --- a/includes/sp-api-functions.php +++ b/includes/sp-api-functions.php @@ -112,11 +112,8 @@ function sp_get_main_result_option() { function sp_get_main_results( $post = 0 ) { $event = new SP_Event( $post ); $results = $event->main_results(); - if ( is_array( $results ) ) { - $reverse_teams = get_option( 'sportspress_event_reverse_teams', 'no' ) === 'yes' ? true : false; - if ( $reverse_teams ) { - $results = array_reverse( $results ); - } + if ( is_array( $results ) && get_option( 'sportspress_event_reverse_teams' ) === 'yes' ) { + $results = array_reverse( $results ); } return $results; } From f37c00de9946bc6a0b967e1cf1d69ab1317d5037 Mon Sep 17 00:00:00 2001 From: Nabil Kadimi Date: Thu, 28 Jun 2018 10:17:45 +0100 Subject: [PATCH 6/6] Minor (line break in code)