From 8d77e7ae3c986617f27958389c04294eea307ecf Mon Sep 17 00:00:00 2001
From: Brian Miyaji <brian@themeboy.com>
Date: Tue, 24 May 2016 15:56:23 +1000
Subject: [PATCH] Combine reverse teams option

---
 .../settings/class-sp-settings-events.php     | 24 +++++++------------
 includes/class-sp-event.php                   |  2 +-
 includes/class-sp-install.php                 |  5 ++++
 templates/event-performance.php               |  2 +-
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/includes/admin/settings/class-sp-settings-events.php b/includes/admin/settings/class-sp-settings-events.php
index dc2bccf2..1ff24601 100644
--- a/includes/admin/settings/class-sp-settings-events.php
+++ b/includes/admin/settings/class-sp-settings-events.php
@@ -122,6 +122,14 @@ class SP_Settings_Events extends SP_Settings_Page {
 						'id' 		=> 'sportspress_event_filter_teams_by_season',
 						'default'	=> 'no',
 						'type' 		=> 'checkbox',
+						'checkboxgroup'	=> '',
+					),
+
+					array(
+						'desc' 		=> __( 'Reverse order', 'sportspress' ),
+						'id' 		=> 'sportspress_event_reverse_teams',
+						'default'	=> 'no',
+						'type' 		=> 'checkbox',
 						'checkboxgroup'	=> 'end',
 					),
 
@@ -256,14 +264,6 @@ class SP_Settings_Events extends SP_Settings_Page {
 						'manual'	=> __( 'Manual', 'sportspress' ),
 					),
 				),
-
-				array(
-					'title'     => __( 'Teams', 'sportspress' ),
-					'desc' 		=> __( 'Reverse order', 'sportspress' ),
-					'id' 		=> 'sportspress_event_results_reverse_teams',
-					'default'	=> 'no',
-					'type' 		=> 'checkbox',
-				),
 				
 				array(
 					'title'     => __( 'Outcome', 'sportspress' ),
@@ -330,14 +330,6 @@ class SP_Settings_Events extends SP_Settings_Page {
 					),
 				),
 
-				array(
-					'title'     => __( 'Teams', 'sportspress' ),
-					'desc' 		=> __( 'Reverse order', 'sportspress' ),
-					'id' 		=> 'sportspress_event_performance_reverse_teams',
-					'default'	=> 'no',
-					'type' 		=> 'checkbox',
-				),
-
 				array(
 					'title'     => __( 'Positions', 'sportspress' ),
 					'desc' 		=> __( 'Top-level only', 'sportspress' ),
diff --git a/includes/class-sp-event.php b/includes/class-sp-event.php
index 6f81bb23..585c4ed7 100644
--- a/includes/class-sp-event.php
+++ b/includes/class-sp-event.php
@@ -45,7 +45,7 @@ class SP_Event extends SP_Custom_Post{
 		// Get results for all teams
 		$data = sp_array_combine( $teams, $results, true );
 		
-		if ( 'yes' === get_option( 'sportspress_event_results_reverse_teams', 'no' ) ) {
+		if ( 'yes' === get_option( 'sportspress_event_reverse_teams', 'no' ) ) {
 			$data = array_reverse( $data, true );
 		}
 
diff --git a/includes/class-sp-install.php b/includes/class-sp-install.php
index 34aa8c53..e7a196ce 100644
--- a/includes/class-sp-install.php
+++ b/includes/class-sp-install.php
@@ -404,6 +404,11 @@ class SP_Install {
 		if ( version_compare( $version, '2.0', '<' ) ) {
 			update_option( 'sportspress_player_columns', 'manual' );
 		}
+		
+		if ( version_compare( $version, '2.1', '<' ) ) {
+			$option = get_option( 'sportspress_event_results_reverse_teams', 'no' );
+			update_option( 'sportspress_event_reverse_teams', $option );
+		}
 	}
 
 	/**
diff --git a/templates/event-performance.php b/templates/event-performance.php
index 1b66d627..0d3e2444 100644
--- a/templates/event-performance.php
+++ b/templates/event-performance.php
@@ -16,7 +16,7 @@ $show_total = get_option( 'sportspress_event_show_total', 'yes' ) === 'yes' ? tr
 $show_numbers = get_option( 'sportspress_event_show_player_numbers', 'yes' ) === 'yes' ? true : false;
 $sections = get_option( 'sportspress_event_performance_sections', -1 );
 $abbreviate_teams = get_option( 'sportspress_abbreviate_teams', 'yes' ) === 'yes' ? true : false;
-$reverse_teams = get_option( 'sportspress_event_performance_reverse_teams', 'no' ) === 'yes' ? true : false;
+$reverse_teams = get_option( 'sportspress_event_reverse_teams', 'no' ) === 'yes' ? true : false;
 $primary = sp_get_main_performance_option();
 $total = get_option( 'sportspress_event_total_performance', 'all');