From c474037ecb1a690c446d400b92cf389a5d3a351c Mon Sep 17 00:00:00 2001 From: Brian Miyaji Date: Wed, 14 Oct 2015 15:33:18 +1100 Subject: [PATCH] Prevent doubling main content in widget area --- includes/widgets/class-sp-widget-event-blocks.php | 8 +++++++- includes/widgets/class-sp-widget-event-calendar.php | 8 +++++++- includes/widgets/class-sp-widget-event-list.php | 8 +++++++- includes/widgets/class-sp-widget-league-table.php | 4 +++- includes/widgets/class-sp-widget-player-gallery.php | 7 ++++++- includes/widgets/class-sp-widget-player-list.php | 7 ++++++- 6 files changed, 36 insertions(+), 6 deletions(-) diff --git a/includes/widgets/class-sp-widget-event-blocks.php b/includes/widgets/class-sp-widget-event-blocks.php index cb979515..7ebd67d6 100644 --- a/includes/widgets/class-sp-widget-event-blocks.php +++ b/includes/widgets/class-sp-widget-event-blocks.php @@ -8,8 +8,14 @@ class SP_Widget_Event_Blocks extends WP_Widget { function widget( $args, $instance ) { extract($args); - $title = apply_filters('widget_title', empty($instance['title']) ? '' : $instance['title'], $instance, $this->id_base); + $id = empty($instance['id']) ? null : $instance['id']; + if ( get_the_ID() === $id ) { + $format = get_post_meta( $id, 'sp_format', true ); + if ( 'blocks' == $format ) return; + } + + $title = apply_filters('widget_title', empty($instance['title']) ? '' : $instance['title'], $instance, $this->id_base); $caption = empty($instance['caption']) ? null : $instance['caption']; $status = empty($instance['status']) ? 'default' : $instance['status']; $date = empty($instance['date']) ? 'default' : $instance['date']; diff --git a/includes/widgets/class-sp-widget-event-calendar.php b/includes/widgets/class-sp-widget-event-calendar.php index 8d600d68..1c7ee966 100644 --- a/includes/widgets/class-sp-widget-event-calendar.php +++ b/includes/widgets/class-sp-widget-event-calendar.php @@ -8,8 +8,14 @@ class SP_Widget_Event_Calendar extends WP_Widget { function widget( $args, $instance ) { extract($args); - $title = apply_filters('widget_title', empty($instance['title']) ? '' : $instance['title'], $instance, $this->id_base); + $id = empty($instance['id']) ? null : $instance['id']; + if ( get_the_ID() === $id ) { + $format = get_post_meta( $id, 'sp_format', true ); + if ( 'calendar' == $format ) return; + } + + $title = apply_filters('widget_title', empty($instance['title']) ? '' : $instance['title'], $instance, $this->id_base); $status = empty($instance['status']) ? 'default' : $instance['status']; $date = empty($instance['date']) ? 'default' : $instance['date']; $date_from = empty($instance['date_from']) ? 'default' : $instance['date_from']; diff --git a/includes/widgets/class-sp-widget-event-list.php b/includes/widgets/class-sp-widget-event-list.php index 63834581..bcd966a3 100644 --- a/includes/widgets/class-sp-widget-event-list.php +++ b/includes/widgets/class-sp-widget-event-list.php @@ -8,8 +8,14 @@ class SP_Widget_Event_List extends WP_Widget { function widget( $args, $instance ) { extract($args); - $title = apply_filters('widget_title', empty($instance['title']) ? '' : $instance['title'], $instance, $this->id_base); + $id = empty($instance['id']) ? null : $instance['id']; + if ( get_the_ID() === $id ) { + $format = get_post_meta( $id, 'sp_format', true ); + if ( 'list' == $format ) return; + } + + $title = apply_filters('widget_title', empty($instance['title']) ? '' : $instance['title'], $instance, $this->id_base); $caption = empty($instance['caption']) ? null : $instance['caption']; $status = empty($instance['status']) ? 'default' : $instance['status']; $date = empty($instance['date']) ? 'default' : $instance['date']; diff --git a/includes/widgets/class-sp-widget-league-table.php b/includes/widgets/class-sp-widget-league-table.php index 2c447dd7..b34c8c79 100644 --- a/includes/widgets/class-sp-widget-league-table.php +++ b/includes/widgets/class-sp-widget-league-table.php @@ -8,8 +8,10 @@ class SP_Widget_League_Table extends WP_Widget { function widget( $args, $instance ) { extract($args); + $id = empty($instance['id']) ? 0 : $instance['id']; - if ( $id <= 0 ) return; + if ( $id <= 0 || get_the_ID() === $id ) return; + $title = apply_filters('widget_title', empty($instance['title']) ? '' : $instance['title'], $instance, $this->id_base); $caption = empty($instance['caption']) ? null : $instance['caption']; $number = empty($instance['number']) ? null : $instance['number']; diff --git a/includes/widgets/class-sp-widget-player-gallery.php b/includes/widgets/class-sp-widget-player-gallery.php index d5a98128..055af36d 100644 --- a/includes/widgets/class-sp-widget-player-gallery.php +++ b/includes/widgets/class-sp-widget-player-gallery.php @@ -8,8 +8,13 @@ class SP_Widget_Player_Gallery extends WP_Widget { function widget( $args, $instance ) { extract($args); + $id = empty($instance['id']) ? 0 : $instance['id']; - if ( $id <= 0 ) return; + if ( $id <= 0 || get_the_ID() === $id ) { + $format = get_post_meta( $id, 'sp_format', true ); + if ( 'gallery' == $format ) return; + } + $title = apply_filters('widget_title', empty($instance['title']) ? '' : $instance['title'], $instance, $this->id_base); $caption = empty($instance['caption']) ? null : $instance['caption']; $number = empty($instance['number']) ? null : $instance['number']; diff --git a/includes/widgets/class-sp-widget-player-list.php b/includes/widgets/class-sp-widget-player-list.php index b3306340..a646774f 100644 --- a/includes/widgets/class-sp-widget-player-list.php +++ b/includes/widgets/class-sp-widget-player-list.php @@ -8,8 +8,13 @@ class SP_Widget_Player_list extends WP_Widget { function widget( $args, $instance ) { extract($args); + $id = empty($instance['id']) ? 0 : $instance['id']; - if ( $id <= 0 ) return; + if ( $id <= 0 || get_the_ID() === $id ) { + $format = get_post_meta( $id, 'sp_format', true ); + if ( 'list' == $format ) return; + } + $title = apply_filters('widget_title', empty($instance['title']) ? '' : $instance['title'], $instance, $this->id_base); $caption = empty($instance['caption']) ? null : $instance['caption']; $number = empty($instance['number']) ? null : $instance['number'];