Steve-Dee-Designs
/
woocommerce
mirror of https://github.com/woocommerce/woocommerce.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #24283 from woocommerce/fix/24240 

Make wc_get_endpoint_url() follow WordPress permalink settings
This commit is contained in:
Rodrigo Primo 2019-08-01 17:36:26 -03:00 committed by GitHub
parent ad6d9ec8fe 833c5016ea
commit aa590c8acd
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 50 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
includes/wc-page-functions.php
View File

@ -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;

46
tests/unit-tests/page-functions/class-wc-tests-page-functions.php Normal file
View File

@ -0,0 +1,46 @@
<?php
/**
* Tests for the functions in includes/wc-page-functions.php.
*
* @package WooCommerce\Tests\PageFunctions
*/
/**
* Page functions tests.
*/
class WC_Tests_Page_Functions extends WC_Unit_Test_Case {
/**
* Test wc_get_endpoint_url() when the option permalink_structure is not set.
*/
public function test_wc_get_endpoint_url_should_add_endpoint_to_query_string() {
$url = wc_get_endpoint_url( 'customer-logout', 'yes', 'https://example.org/' );
$this->assertEquals( 'https://example.org/?customer-logout=yes', $url );
}
/**
* Test wc_get_endpoint_url() when the option permalink_structure is set.
*/
public function test_wc_get_endpoint_url_should_add_endpoint_to_query_path() {
global $wp_rewrite;
update_option( 'permalink_structure', '/%postname%/' );
$wp_rewrite->use_trailing_slashes = true;
$url = wc_get_endpoint_url( 'customer-logout', '', 'https://example.org/' );
$this->assertEquals( 'https://example.org/customer-logout/', $url );
$url = wc_get_endpoint_url( 'customer-logout', 'yes', 'https://example.org/' );
$this->assertEquals( 'https://example.org/customer-logout/yes/', $url );
$url = wc_get_endpoint_url( 'customer-logout', 'yes', 'https://example.org/?foo=bar' );
$this->assertEquals( 'https://example.org/customer-logout/yes/?foo=bar', $url );
// test added after issue https://github.com/woocommerce/woocommerce/issues/24240.
update_option( 'permalink_structure', '/%postname%' );
$wp_rewrite->use_trailing_slashes = false;
$url = wc_get_endpoint_url( 'customer-logout', '', 'https://example.org/' );
$this->assertEquals( 'https://example.org/customer-logout', $url );
}
}