From 6d7f88d722ae206da3127b3427d2c6db001716d7 Mon Sep 17 00:00:00 2001
From: Brian Miyaji <brian@themeboy.com>
Date: Tue, 21 Mar 2017 16:06:24 +1100
Subject: [PATCH] Apply default sport and fix empty positions in wizard

---
 includes/admin/class-sp-admin-settings.php     | 3 ++-
 includes/admin/class-sp-admin-setup-wizard.php | 9 +++++----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/includes/admin/class-sp-admin-settings.php b/includes/admin/class-sp-admin-settings.php
index 6da7bfff..3c669269 100644
--- a/includes/admin/class-sp-admin-settings.php
+++ b/includes/admin/class-sp-admin-settings.php
@@ -442,8 +442,9 @@ class SP_Admin_Settings {
 	            // Select sport
 	            case 'sport' :
 
+            		$default = apply_filters( 'sportspress_default_sport', 'soccer' );
 	            	$option_value 	= self::get_option( $value['id'], $value['default'] );
-	            	if ( 'none' === $option_value ) $option_value = 'soccer';
+	            	if ( 'none' === $option_value ) $option_value = $default;
 
 	            	$categories = SP_Admin_Sports::sport_category_names();
 
diff --git a/includes/admin/class-sp-admin-setup-wizard.php b/includes/admin/class-sp-admin-setup-wizard.php
index bcea6ddf..6f4c11c4 100644
--- a/includes/admin/class-sp-admin-setup-wizard.php
+++ b/includes/admin/class-sp-admin-setup-wizard.php
@@ -255,8 +255,9 @@ class WC_Admin_Setup_Wizard {
           <td>
             <?php
             $options = SP_Admin_Sports::get_preset_options();
-            $default = get_option( 'sportspress_sport', 'soccer' );
-            if ( 'none' === $default ) $default = 'soccer';
+            $default = apply_filters( 'sportspress_default_sport', 'soccer' );
+            $sport = get_option( 'sportspress_sport', $default );
+            if ( 'none' === $sport ) $sport = $default;
             $categories = SP_Admin_Sports::sport_category_names();
             ?>
             <select name="sport" id="sport" class="sp-select-sport <?php echo esc_attr( $class ); ?>">
@@ -267,7 +268,7 @@ class WC_Admin_Setup_Wizard {
                   <?php
                   foreach ( $options as $key => $val ) {
                     ?>
-                    <option value="<?php echo esc_attr( $key ); ?>" <?php selected( $default, $key ); ?>><?php echo $val ?></option>
+                    <option value="<?php echo esc_attr( $key ); ?>" <?php selected( $sport, $key ); ?>><?php echo $val ?></option>
                     <?php
                   }
                   ?>
@@ -409,7 +410,7 @@ class WC_Admin_Setup_Wizard {
    * Players & Staff Setup.
    */
   public function sp_setup_players_staff() {
-    $positions = get_terms( 'sp_position', array( 'hide_empty' => 0, 'orderby' => 'slug', 'fields' => 'names' ) )
+    $positions = (array) get_terms( 'sp_position', array( 'hide_empty' => 0, 'orderby' => 'slug', 'fields' => 'names' ) )
     ?>
     <h1><?php esc_html_e( 'Player & Staff Setup', 'sportspress' ); ?></h1>
     <form method="post">