wc_get_endpoint_url - added support for permalinks containing a query string Closes #5016
This commit is contained in:
parent
cd11784be9
commit
e81c018e60
|
@ -49,10 +49,17 @@ function wc_get_endpoint_url( $endpoint, $value = '', $permalink = '' ) {
|
||||||
// Map endpoint to options
|
// Map endpoint to options
|
||||||
$endpoint = isset( WC()->query->query_vars[ $endpoint ] ) ? WC()->query->query_vars[ $endpoint ] : $endpoint;
|
$endpoint = isset( WC()->query->query_vars[ $endpoint ] ) ? WC()->query->query_vars[ $endpoint ] : $endpoint;
|
||||||
|
|
||||||
if ( get_option( 'permalink_structure' ) )
|
if ( get_option( 'permalink_structure' ) ) {
|
||||||
$url = trailingslashit( $permalink ) . $endpoint . '/' . $value;
|
if ( strstr( $permalink, '?' ) ) {
|
||||||
else
|
$query_string = '?' . parse_url( $permalink, PHP_URL_QUERY );
|
||||||
|
$permalink = current( explode( '?', $permalink ) );
|
||||||
|
} else {
|
||||||
|
$query_string = '';
|
||||||
|
}
|
||||||
|
$url = trailingslashit( $permalink ) . $endpoint . '/' . $value . $query_string;
|
||||||
|
} else {
|
||||||
$url = add_query_arg( $endpoint, $value, $permalink );
|
$url = add_query_arg( $endpoint, $value, $permalink );
|
||||||
|
}
|
||||||
|
|
||||||
return apply_filters( 'woocommerce_get_endpoint_url', $url );
|
return apply_filters( 'woocommerce_get_endpoint_url', $url );
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in New Issue