Use new get_activity_link method

This commit is contained in:
Justin Foell
2020-06-26 14:20:55 -05:00
parent 8244602957
commit 0df78b8568
3 changed files with 15 additions and 9 deletions
+1 -2
View File
@@ -42,8 +42,7 @@ class WPStrava_ActivitiesList {
foreach ( $activities as $activity ) {
$response .= "<li class='activity'>";
$response .= empty( $activity->id ) ?
$activity->name :
"<a href='" . WPStrava_Activity::ACTIVITIES_URL . $activity->id . "'>" . $activity->name . '</a>';
$activity->name : $strava_activity->get_activity_link( $activity->id, $activity->name );
$response .= "<div class='activity-item'>";
if ( ! empty( $activity->start_date_local ) ) {
+7 -4
View File
@@ -53,10 +53,13 @@ class WPStrava_ActivityRenderer {
$map_width = str_replace( 'px', '', $map_width );
$map_height = str_replace( 'px', '', $map_height );
$activity_output .= '<a title="' . $activity_details->name . '" href="' . WPStrava_Activity::ACTIVITIES_URL . $activity_details->id . '">' .
WPStrava_StaticMap::get_image_tag( $activity_details, $map_height, $map_width, $atts['markers'] ) .
'</a>
</div>';
$activity_output .= $activity->get_activity_link(
$activity_details->id,
WPStrava_StaticMap::get_image_tag( $activity_details, $map_height, $map_width, $atts['markers'], $activity_details->name ),
$activity_details->name
);
$activity_output .= '</div>';
} // End if( $activity_details ).
return $activity_output;
}
+7 -3
View File
@@ -38,9 +38,13 @@ class WPStrava_LatestMap {
echo empty( $activity->map ) ?
// Translators: Text with activity name shown in place of image if not available.
esc_html( sprintf( __( 'Map not available for activity "%s"', 'wp-strava' ), $activity->name ) ) :
"<a title='" . esc_attr( $activity->name ) . "' href='" . esc_attr( WPStrava_Activity::ACTIVITIES_URL . $activity->id ) . "'>" .
WPStrava_StaticMap::get_image_tag( $activity ) . // phpcs:ignore WordPress.Security.EscapeOutput.OutputNotEscaped -- Image OK.
'</a>';
// phpcs:disable WordPress.Security.EscapeOutput.OutputNotEscaped -- Image OK.
$strava_activity->get_activity_link(
$activity->id,
WPStrava_StaticMap::get_image_tag( $activity, null, null, false, $activity->name ),
$activity->name
);
// phpcs:enable WordPress.Security.EscapeOutput.OutputNotEscaped
}
}
}