From f21ed7f5225c9532df75ba07e8f136e32224001f Mon Sep 17 00:00:00 2001 From: Brian Miyaji Date: Thu, 23 Jan 2014 02:25:48 +1100 Subject: [PATCH] Little fixes --- admin/hooks/sanitize-title.php | 2 +- admin/post-types/calendar.php | 1 + admin/post-types/column.php | 1 + admin/post-types/list.php | 1 + admin/post-types/metric.php | 1 + admin/post-types/outcome.php | 1 + admin/post-types/player.php | 1 + admin/post-types/result.php | 1 + admin/post-types/staff.php | 1 + admin/post-types/statistic.php | 1 + admin/post-types/table.php | 1 + admin/post-types/team.php | 1 + admin/settings/players.php | 4 ++-- admin/templates/event-details.php | 13 ++++++++----- admin/terms/league.php | 3 ++- admin/terms/position.php | 3 ++- admin/terms/season.php | 3 ++- admin/terms/venue.php | 3 ++- functions.php | 16 +++++++++++++++- 19 files changed, 45 insertions(+), 13 deletions(-) diff --git a/admin/hooks/sanitize-title.php b/admin/hooks/sanitize-title.php index 8802e6c4..2d779592 100644 --- a/admin/hooks/sanitize-title.php +++ b/admin/hooks/sanitize-title.php @@ -7,7 +7,7 @@ function sportspress_sanitize_title( $title ) { elseif ( isset( $_POST ) && array_key_exists( 'post_type', $_POST ) && in_array( $_POST['post_type'], array( 'sp_result', 'sp_outcome', 'sp_column', 'sp_statistic', 'sp_metric' ) ) ): - $key = $_POST['sp_key']; + $key = isset( $_POST['sp_key'] ) ? $_POST['sp_key'] : null; if ( ! $key ) $key = $_POST['post_title']; diff --git a/admin/post-types/calendar.php b/admin/post-types/calendar.php index 5c8ceb2f..246f416d 100644 --- a/admin/post-types/calendar.php +++ b/admin/post-types/calendar.php @@ -8,6 +8,7 @@ function sportspress_calendar_post_init() { 'label' => $name, 'labels' => $labels, 'public' => true, + 'has_archive' => false, 'hierarchical' => false, 'supports' => array( 'title', 'author', 'thumbnail', 'excerpt' ), 'register_meta_box_cb' => 'sportspress_calendar_meta_init', diff --git a/admin/post-types/column.php b/admin/post-types/column.php index b3c9c85a..5fb87da0 100644 --- a/admin/post-types/column.php +++ b/admin/post-types/column.php @@ -10,6 +10,7 @@ function sportspress_column_post_init() { 'public' => false, 'show_ui' => true, 'show_in_menu' => false, + 'has_archive' => false, 'hierarchical' => false, 'supports' => array( 'title', 'page-attributes' ), 'register_meta_box_cb' => 'sportspress_column_meta_init', diff --git a/admin/post-types/list.php b/admin/post-types/list.php index ca15babc..1cf65d4f 100644 --- a/admin/post-types/list.php +++ b/admin/post-types/list.php @@ -8,6 +8,7 @@ function sportspress_list_post_init() { 'label' => $name, 'labels' => $labels, 'public' => true, + 'has_archive' => false, 'hierarchical' => false, 'supports' => array( 'title', 'author', 'thumbnail' ), 'register_meta_box_cb' => 'sportspress_list_meta_init', diff --git a/admin/post-types/metric.php b/admin/post-types/metric.php index 54ea67ed..fe33c9cc 100644 --- a/admin/post-types/metric.php +++ b/admin/post-types/metric.php @@ -10,6 +10,7 @@ function sportspress_metric_post_init() { 'public' => false, 'show_ui' => true, 'show_in_menu' => false, + 'has_archive' => false, 'hierarchical' => false, 'supports' => array( 'title', 'page-attributes' ), 'capability_type' => 'sp_config' diff --git a/admin/post-types/outcome.php b/admin/post-types/outcome.php index 534d9604..d43f581e 100644 --- a/admin/post-types/outcome.php +++ b/admin/post-types/outcome.php @@ -10,6 +10,7 @@ function sportspress_outcome_post_init() { 'public' => false, 'show_ui' => true, 'show_in_menu' => false, + 'has_archive' => false, 'hierarchical' => false, 'supports' => array( 'title', 'page-attributes' ), 'register_meta_box_cb' => 'sportspress_outcome_meta_init', diff --git a/admin/post-types/player.php b/admin/post-types/player.php index 6374c7ac..c5f81a4d 100644 --- a/admin/post-types/player.php +++ b/admin/post-types/player.php @@ -8,6 +8,7 @@ function sportspress_player_post_init() { 'label' => $name, 'labels' => $labels, 'public' => true, + 'has_archive' => false, 'hierarchical' => false, 'supports' => array( 'title', 'author', 'thumbnail', 'page-attributes' ), 'register_meta_box_cb' => 'sportspress_player_meta_init', diff --git a/admin/post-types/result.php b/admin/post-types/result.php index aa8a44e3..732a9e95 100644 --- a/admin/post-types/result.php +++ b/admin/post-types/result.php @@ -10,6 +10,7 @@ function sportspress_result_post_init() { 'public' => false, 'show_ui' => true, 'show_in_menu' => false, + 'has_archive' => false, 'hierarchical' => false, 'supports' => array( 'title', 'page-attributes' ), 'register_meta_box_cb' => 'sportspress_result_meta_init', diff --git a/admin/post-types/staff.php b/admin/post-types/staff.php index 4962d0c3..aca7752d 100644 --- a/admin/post-types/staff.php +++ b/admin/post-types/staff.php @@ -8,6 +8,7 @@ function sportspress_staff_post_init() { 'label' => $name, 'labels' => $labels, 'public' => true, + 'has_archive' => false, 'hierarchical' => false, 'supports' => array( 'title', 'author', 'thumbnail' ), 'register_meta_box_cb' => 'sportspress_staff_meta_init', diff --git a/admin/post-types/statistic.php b/admin/post-types/statistic.php index da45ed77..3c1d0b25 100644 --- a/admin/post-types/statistic.php +++ b/admin/post-types/statistic.php @@ -10,6 +10,7 @@ function sportspress_statistic_post_init() { 'public' => false, 'show_ui' => true, 'show_in_menu' => false, + 'has_archive' => false, 'hierarchical' => false, 'supports' => array( 'title', 'page-attributes' ), 'register_meta_box_cb' => 'sportspress_statistic_meta_init', diff --git a/admin/post-types/table.php b/admin/post-types/table.php index 122cd8f0..b4916bba 100644 --- a/admin/post-types/table.php +++ b/admin/post-types/table.php @@ -8,6 +8,7 @@ function sportspress_table_post_init() { 'label' => $name, 'labels' => $labels, 'public' => true, + 'has_archive' => false, 'hierarchical' => false, 'supports' => array( 'title', 'author', 'thumbnail', 'excerpt' ), 'register_meta_box_cb' => 'sportspress_table_meta_init', diff --git a/admin/post-types/team.php b/admin/post-types/team.php index b24dc3d4..0e4901c7 100644 --- a/admin/post-types/team.php +++ b/admin/post-types/team.php @@ -8,6 +8,7 @@ function sportspress_team_post_init() { 'label' => $name, 'labels' => $labels, 'public' => true, + 'has_archive' => false, 'hierarchical' => true, 'supports' => array( 'title', 'editor', 'author', 'thumbnail', 'page-attributes' ), 'register_meta_box_cb' => 'sportspress_team_meta_init', diff --git a/admin/settings/players.php b/admin/settings/players.php index 1275aa7d..d38a7b87 100644 --- a/admin/settings/players.php +++ b/admin/settings/players.php @@ -35,8 +35,8 @@ $args = array( 'post_type' => 'sp_statistic', 'numberposts' => -1, 'posts_per_page' => -1, - 'orderby' => 'menu_order', - 'order' => 'ASC' + 'orderby' => 'menu_order', + 'order' => 'ASC' ); $data = get_posts( $args ); ?> diff --git a/admin/templates/event-details.php b/admin/templates/event-details.php index 1acb3f6d..4e5e0000 100644 --- a/admin/templates/event-details.php +++ b/admin/templates/event-details.php @@ -12,12 +12,15 @@ if ( !function_exists( 'sportspress_event_details' ) ) { $data = array( __( 'Date', 'sportspress' ) => $date, __( 'Time', 'sportspress' ) => $time ); - if ( $leagues ) - $data[ __( 'League', 'sportspress' ) ] = sportspress_array_value( $leagues, 0, '—' )->name; - - if ( $seasons ) - $data[ __( 'Season', 'sportspress' ) ] = sportspress_array_value( $seasons, 0, '—' )->name; + if ( $leagues ): + $league = array_pop( $leagues ); + $data[ __( 'League', 'sportspress' ) ] = $league->name; + endif; + if ( $seasons ): + $season = array_pop( $seasons ); + $data[ __( 'Season', 'sportspress' ) ] = $season->name; + endif; $output = '

' . __( 'Details', 'sportspress' ) . '

'; diff --git a/admin/terms/league.php b/admin/terms/league.php index 7ed77f03..ab9518b1 100644 --- a/admin/terms/league.php +++ b/admin/terms/league.php @@ -9,7 +9,8 @@ function sportspress_league_term_init() { 'label' => $name, 'labels' => $labels, 'public' => true, - 'has_archive' => false, + 'show_in_nav_menus' => false, + 'show_tagcloud' => false, 'hierarchical' => true, 'rewrite' => array( 'slug' => 'league' ), ); diff --git a/admin/terms/position.php b/admin/terms/position.php index cd9eb748..d8c5e5ef 100644 --- a/admin/terms/position.php +++ b/admin/terms/position.php @@ -9,7 +9,8 @@ function sportspress_position_term_init() { 'label' => $name, 'labels' => $labels, 'public' => true, - 'has_archive' => false, + 'show_in_nav_menus' => false, + 'show_tagcloud' => false, 'hierarchical' => true, 'rewrite' => array( 'slug' => 'position' ), ); diff --git a/admin/terms/season.php b/admin/terms/season.php index 4b629c09..39076d6c 100644 --- a/admin/terms/season.php +++ b/admin/terms/season.php @@ -9,7 +9,8 @@ function sportspress_season_term_init() { 'label' => $name, 'labels' => $labels, 'public' => true, - 'has_archive' => false, + 'show_in_nav_menus' => false, + 'show_tagcloud' => false, 'hierarchical' => true, 'rewrite' => array( 'slug' => 'season' ), ); diff --git a/admin/terms/venue.php b/admin/terms/venue.php index 55e824ec..51ddd81f 100644 --- a/admin/terms/venue.php +++ b/admin/terms/venue.php @@ -9,7 +9,8 @@ function sportspress_venue_term_init() { 'label' => $name, 'labels' => $labels, 'public' => true, - 'has_archive' => false, + 'show_in_nav_menus' => false, + 'show_tagcloud' => false, 'hierarchical' => true, 'rewrite' => array( 'slug' => 'venue' ), ); diff --git a/functions.php b/functions.php index 28622314..169a3f24 100644 --- a/functions.php +++ b/functions.php @@ -1071,9 +1071,23 @@ if ( !function_exists( 'sportspress_solve' ) ) { endif; } - } + +if ( !function_exists( 'sportspress_event_players_lineup_filter' ) ) { + function sportspress_event_players_lineup_filter( $arr ) { + return sportspress_array_value( $arr, 'status', 'lineup' ) == 'lineup'; + } +} + + +if ( !function_exists( 'sportspress_event_players_sub_filter' ) ) { + function sportspress_event_players_sub_filter( $arr ) { + return sportspress_array_value( $arr, 'status', 'lineup' ) == 'sub'; + } +} + + if ( !function_exists( 'sportspress_get_calendar_data' ) ) { function sportspress_get_calendar_data( $post_id ) { $leagues = get_the_terms( $post_id, 'sp_league' );