Make wc_get_endpoint_url() compatible with WordPress use_trailing_slashes settings

claudiosanches · claudiosanches · commit c4afd53749c1 · 2019-07-31T20:57:55.000-03:00
diff --git a/includes/wc-page-functions.php b/includes/wc-page-functions.php
@@ -101,10 +101,12 @@ function wc_get_endpoint_url( $endpoint, $value = '', $permalink = '' ) {
 		} else {
 			$query_string = '';
 		}
-		$url = trailingslashit( $permalink ) . trailingslashit( $endpoint );
+		$url = trailingslashit( $permalink );
 
 		if ( $value ) {
-			$url .= trailingslashit( $value );
+			$url .= trailingslashit( $endpoint ) . user_trailingslashit( $value );
+		} else {
+			$url .= user_trailingslashit( $endpoint );
 		}
 
 		$url .= $query_string;

Original file line number	Diff line number	Diff line change
`@@ -101,10 +101,12 @@ function wc_get_endpoint_url( $endpoint, $value = '', $permalink = '' ) {`
`101`	`101`	`} else {`
`102`	`102`	`$query_string = '';`
`103`	`103`	`}`
`104`		`- $url = trailingslashit( $permalink ) . trailingslashit( $endpoint );`
	`104`	`+ $url = trailingslashit( $permalink );`
`105`	`105`
`106`	`106`	`if ( $value ) {`
`107`		`- $url .= trailingslashit( $value );`
	`107`	`+ $url .= trailingslashit( $endpoint ) . user_trailingslashit( $value );`
	`108`	`+ } else {`
	`109`	`+ $url .= user_trailingslashit( $endpoint );`
`108`	`110`	`}`
`109`	`111`
`110`	`112`	`$url .= $query_string;`