From 6b06aa0995123579caa0a771bc98aaad9f2b2b28 Mon Sep 17 00:00:00 2001 From: Brian Miyaji Date: Sat, 25 Apr 2015 18:37:27 +1000 Subject: [PATCH] Force future event permalinks --- includes/class-sp-wpml.php | 6 +++--- templates/countdown.php | 2 +- templates/event-blocks.php | 4 ++-- templates/event-calendar.php | 2 +- templates/event-list.php | 24 ++++++++++++------------ 5 files changed, 19 insertions(+), 19 deletions(-) diff --git a/includes/class-sp-wpml.php b/includes/class-sp-wpml.php index c5c075b1..461d1252 100644 --- a/includes/class-sp-wpml.php +++ b/includes/class-sp-wpml.php @@ -51,7 +51,7 @@ class SP_WPML { return $title; } - public static function post_type_link( $url, $post = null, $leavename = false ) { + public static function post_type_link( $url, $post = null, $leavename = false, $sample = false ) { if ( self::can_localize( $post ) ): if ( ! $post ) global $post; @@ -62,7 +62,7 @@ class SP_WPML { $translated_id = icl_object_id( $id, 'any', false, ICL_LANGUAGE_CODE ); if ( $translated_id && $translated_id != $id && get_the_ID() != $translated_id ): - return get_permalink( $translated_id, $leavename ); + return get_post_permalink( $translated_id, $leavename, $sample ); endif; endif; @@ -88,7 +88,7 @@ class SP_WPML { // Get URL $translated_id = icl_object_id( $id, 'any', false, $code ); if ( ! $translated_id ) continue; - $url = get_permalink( $translated_id ); + $url = get_post_permalink( $translated_id, false, true ); // Get native name; $native_name = sp_array_value( $v, 'native_name' ); diff --git a/templates/countdown.php b/templates/countdown.php index 2a91ef88..12c998b3 100644 --- a/templates/countdown.php +++ b/templates/countdown.php @@ -32,7 +32,7 @@ extract( $defaults, EXTR_SKIP ); if ( ! isset( $post ) ) return; $title = $post->post_title; -if ( $link_events ) $title = '' . $title . ''; +if ( $link_events ) $title = '' . $title . ''; ?>
diff --git a/templates/event-blocks.php b/templates/event-blocks.php index 919ea6a4..f2293d98 100644 --- a/templates/event-blocks.php +++ b/templates/event-blocks.php @@ -79,7 +79,7 @@ if ( $show_title && $id ) { $j++; if ( has_post_thumbnail ( $team ) ): if ( $link_teams ): - $logo = ''; + $logo = ''; else: $logo = get_the_post_thumbnail( $team, 'sportspress-fit-icon', array( 'class' => 'team-logo logo-' . ( $j % 2 ? 'odd' : 'even' ) ) ); endif; @@ -122,7 +122,7 @@ if ( $show_title && $id ) {

- post_title; ?> + post_title; ?> post_title; ?> diff --git a/templates/event-calendar.php b/templates/event-calendar.php index 677d8c41..d71ba8ab 100644 --- a/templates/event-calendar.php +++ b/templates/event-calendar.php @@ -201,7 +201,7 @@ for ( $day = 1; $day <= $daysinmonth; ++$day ) { $calendar_output .= ''; if ( array_key_exists($day, $daywithpost) ) // any posts today? - $calendar_output .= '$day"; + $calendar_output .= '$day"; else $calendar_output .= $day; $calendar_output .= ''; diff --git a/templates/event-list.php b/templates/event-list.php index a31675f8..d57a0767 100644 --- a/templates/event-list.php +++ b/templates/event-list.php @@ -4,7 +4,7 @@ * * @author ThemeBoy * @package SportsPress/Templates - * @version 1.6.1 + * @version 1.8.2 */ if ( ! defined( 'ABSPATH' ) ) exit; // Exit if accessed directly @@ -184,7 +184,7 @@ if ( $show_title && $id ) { $date_html = '' . get_post_time( 'Y-m-d H:i:s', false, $event ) . '' . get_post_time( get_option( 'date_format' ), false, $event, true ); - if ( $link_events ) $date_html = '' . $date_html . ''; + if ( $link_events ) $date_html = '' . $date_html . ''; echo '' . $date_html . ''; @@ -196,7 +196,7 @@ if ( $show_title && $id ) { if ( 'combined' == $time_format && sp_column_active( $usecolumns, 'time' ) ) { echo ''; - if ( $link_events ) echo ''; + if ( $link_events ) echo ''; if ( ! empty( $main_results ) ): echo implode( ' - ', $main_results ); else: @@ -206,7 +206,7 @@ if ( $show_title && $id ) { echo ''; } elseif ( in_array( $time_format, array( 'separate', 'results' ) ) && sp_column_active( $usecolumns, 'results' ) ) { echo ''; - if ( $link_events ) echo ''; + if ( $link_events ) echo ''; if ( ! empty( $main_results ) ): echo implode( ' - ', $main_results ); else: @@ -221,7 +221,7 @@ if ( $show_title && $id ) { if ( in_array( $time_format, array( 'separate', 'time' ) ) && sp_column_active( $usecolumns, 'time' ) ) { echo ''; - if ( $link_events ) echo ''; + if ( $link_events ) echo ''; echo ' ' . get_post_time( 'H:i:s', false, $event ) . '' . sp_get_time( $event ); if ( $link_events ) echo ''; echo ''; @@ -234,7 +234,7 @@ if ( $show_title && $id ) { echo '' . $teams_output . ''; } else { $title_html = implode( ' ', $team_logos ) . ' ' . $event->post_title; - if ( $link_events ) $title_html = '' . $title_html . ''; + if ( $link_events ) $title_html = '' . $title_html . ''; echo '' . $title_html . ''; } } @@ -243,14 +243,14 @@ if ( $show_title && $id ) { case 'separate': if ( sp_column_active( $usecolumns, 'time' ) ) { echo ''; - if ( $link_events ) echo ''; + if ( $link_events ) echo ''; echo ' ' . get_post_time( 'H:i:s', false, $event ) . '' . sp_get_time( $event ); if ( $link_events ) echo ''; echo ''; } if ( sp_column_active( $usecolumns, 'results' ) ) { echo ''; - if ( $link_events ) echo ''; + if ( $link_events ) echo ''; if ( ! empty( $main_results ) ): echo implode( ' - ', $main_results ); else: @@ -263,7 +263,7 @@ if ( $show_title && $id ) { case 'time': if ( sp_column_active( $usecolumns, 'time' ) ) { echo ''; - if ( $link_events ) echo ''; + if ( $link_events ) echo ''; echo ' ' . get_post_time( 'H:i:s', false, $event ) . '' . sp_get_time( $event ); if ( $link_events ) echo ''; echo ''; @@ -272,7 +272,7 @@ if ( $show_title && $id ) { case 'results': if ( sp_column_active( $usecolumns, 'results' ) ) { echo ''; - if ( $link_events ) echo ''; + if ( $link_events ) echo ''; if ( ! empty( $main_results ) ): echo implode( ' - ', $main_results ); else: @@ -285,7 +285,7 @@ if ( $show_title && $id ) { default: if ( sp_column_active( $usecolumns, 'time' ) ) { echo ''; - if ( $link_events ) echo ''; + if ( $link_events ) echo ''; if ( ! empty( $main_results ) ): echo implode( ' - ', $main_results ); else: @@ -330,7 +330,7 @@ if ( $show_title && $id ) { if ( sp_column_active( $usecolumns, 'article' ) ): echo ''; - if ( $link_events ) echo ''; + if ( $link_events ) echo ''; if ( $video ): echo '
';