10h30/wp-strava
1
0
Fork 0
mirror of https://github.com/10h30/wp-strava.git synced 2026-06-05 15:10:01 +09:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #111 from cmanon/feature/110-club-list-empty

Browse Source 
Add check for activity ID before assembling list
This commit is contained in:
Justin Foell
2021-09-24 14:08:53 -05:00
committed by GitHub
parent 6587fdfd9c bf0376a2b1
commit 35cc861f1e
1 changed files with 16 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/WPStrava/ActivitiesListRenderer.php
+16 -9
View File
@@ -48,9 +48,11 @@ class WPStrava_ActivitiesListRenderer {
}
$response = "<ul id='activities'>";
foreach ( $activities as $activity_summary ) {
// Re-get single activity for greater detail (will be cached).
$activity = $strava_activity->get_activity( $atts['client_id'], $activity_summary->id );
foreach ( $activities as $activity ) {
if ( ! empty( $activity->id ) ) {
// Re-get single activity for greater detail (will be cached).
$activity = $strava_activity->get_activity( $atts['client_id'], $activity->id );
}
$response .= "<li class='activity'>";
$response .= empty( $activity->id ) ?
$activity->name : $strava_activity->get_activity_link( $activity->id, $activity->name );
@@ -66,19 +68,24 @@ class WPStrava_ActivitiesListRenderer {
);
}
if ( is_numeric( $atts['strava_club_id'] ) ) {
if ( is_numeric( $atts['strava_club_id'] ) && ! empty( $activity->athlete ) ) {
$name = $activity->athlete->firstname . ' ' . $activity->athlete->lastname;
$response .= empty( $activity->athlete->id ) ?
" {$name}" :
" <a href='" . WPStrava_Activity::ATHLETES_URL . $activity->athlete->id . "'>" . $name . '</a>';
}
// Translators: "went 10 miles"
$response .= sprintf( __( ' went %1$s %2$s', 'wp-strava' ), $som->distance( $activity->distance ), $som->get_distance_label() );
// Translators: "during 2 hours"
$response .= sprintf( __( ' during %1$s %2$s', 'wp-strava' ), $som->time( $activity->moving_time ), $som->get_time_label() );
if ( ! empty( $activity->distance ) ) {
// Translators: "went 10 miles"
$response .= sprintf( __( ' went %1$s %2$s', 'wp-strava' ), $som->distance( $activity->distance ), $som->get_distance_label() );
}
if ( ! WPStrava::get_instance()->settings->hide_elevation ) {
if ( ! empty( $activity->moving_time ) ) {
// Translators: "during 2 hours"
$response .= sprintf( __( ' during %1$s %2$s', 'wp-strava' ), $som->time( $activity->moving_time ), $som->get_time_label() );
}
if ( ! WPStrava::get_instance()->settings->hide_elevation && ! empty( $activity->total_elevation_gain ) ) {
// Translators: "climbing 100 ft."
$response .= sprintf( __( ' climbing %1$s %2$s', 'wp-strava' ), $som->elevation( $activity->total_elevation_gain ), $som->get_elevation_label() );
}