From 5d5e90376c1350e9e6a953902696f8c185bdbed3 Mon Sep 17 00:00:00 2001 From: Brian Miyaji Date: Sun, 22 Nov 2015 13:33:33 +1100 Subject: [PATCH] Revert "Prevent doubling main content in widget area" This reverts commit c474037ecb1a690c446d400b92cf389a5d3a351c. --- 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, 6 insertions(+), 36 deletions(-) diff --git a/includes/widgets/class-sp-widget-event-blocks.php b/includes/widgets/class-sp-widget-event-blocks.php index 7ebd67d6..cb979515 100644 --- a/includes/widgets/class-sp-widget-event-blocks.php +++ b/includes/widgets/class-sp-widget-event-blocks.php @@ -8,14 +8,8 @@ class SP_Widget_Event_Blocks extends WP_Widget { function widget( $args, $instance ) { extract($args); - - $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); + $id = empty($instance['id']) ? null : $instance['id']; $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 1c7ee966..8d600d68 100644 --- a/includes/widgets/class-sp-widget-event-calendar.php +++ b/includes/widgets/class-sp-widget-event-calendar.php @@ -8,14 +8,8 @@ class SP_Widget_Event_Calendar extends WP_Widget { function widget( $args, $instance ) { extract($args); - - $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); + $id = empty($instance['id']) ? null : $instance['id']; $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 bcd966a3..63834581 100644 --- a/includes/widgets/class-sp-widget-event-list.php +++ b/includes/widgets/class-sp-widget-event-list.php @@ -8,14 +8,8 @@ class SP_Widget_Event_List extends WP_Widget { function widget( $args, $instance ) { extract($args); - - $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); + $id = empty($instance['id']) ? null : $instance['id']; $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 b34c8c79..2c447dd7 100644 --- a/includes/widgets/class-sp-widget-league-table.php +++ b/includes/widgets/class-sp-widget-league-table.php @@ -8,10 +8,8 @@ class SP_Widget_League_Table extends WP_Widget { function widget( $args, $instance ) { extract($args); - $id = empty($instance['id']) ? 0 : $instance['id']; - if ( $id <= 0 || get_the_ID() === $id ) return; - + if ( $id <= 0 ) 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 055af36d..d5a98128 100644 --- a/includes/widgets/class-sp-widget-player-gallery.php +++ b/includes/widgets/class-sp-widget-player-gallery.php @@ -8,13 +8,8 @@ class SP_Widget_Player_Gallery extends WP_Widget { function widget( $args, $instance ) { extract($args); - $id = empty($instance['id']) ? 0 : $instance['id']; - if ( $id <= 0 || get_the_ID() === $id ) { - $format = get_post_meta( $id, 'sp_format', true ); - if ( 'gallery' == $format ) return; - } - + if ( $id <= 0 ) 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 a646774f..b3306340 100644 --- a/includes/widgets/class-sp-widget-player-list.php +++ b/includes/widgets/class-sp-widget-player-list.php @@ -8,13 +8,8 @@ class SP_Widget_Player_list extends WP_Widget { function widget( $args, $instance ) { extract($args); - $id = empty($instance['id']) ? 0 : $instance['id']; - if ( $id <= 0 || get_the_ID() === $id ) { - $format = get_post_meta( $id, 'sp_format', true ); - if ( 'list' == $format ) return; - } - + if ( $id <= 0 ) 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'];