Merge pull request #29002 from n3f/fix/webhook_loading_limit
Respect the $limit parameter (0)
This commit is contained in:
commit
9658b3a59c
|
@ -164,13 +164,13 @@ function wc_load_webhooks( $status = '', $limit = null ) {
|
||||||
$loaded = 0;
|
$loaded = 0;
|
||||||
|
|
||||||
foreach ( $webhooks as $webhook_id ) {
|
foreach ( $webhooks as $webhook_id ) {
|
||||||
$webhook = new WC_Webhook( $webhook_id );
|
|
||||||
$webhook->enqueue();
|
|
||||||
$loaded ++;
|
|
||||||
|
|
||||||
if ( ! is_null( $limit ) && $loaded >= $limit ) {
|
if ( ! is_null( $limit ) && $loaded >= $limit ) {
|
||||||
break;
|
break;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
$webhook = new WC_Webhook( $webhook_id );
|
||||||
|
$webhook->enqueue();
|
||||||
|
$loaded ++;
|
||||||
}
|
}
|
||||||
|
|
||||||
return 0 < $loaded;
|
return 0 < $loaded;
|
||||||
|
|
|
@ -172,6 +172,10 @@ class WC_Tests_Webhook_Functions extends WC_Unit_Test_Case {
|
||||||
$webhook_one = $this->create_webhook( 'action.woocommerce_one_test' );
|
$webhook_one = $this->create_webhook( 'action.woocommerce_one_test' );
|
||||||
$webhook_two = $this->create_webhook( 'action.woocommerce_two_test' );
|
$webhook_two = $this->create_webhook( 'action.woocommerce_two_test' );
|
||||||
|
|
||||||
|
$this->assertFalse( wc_load_webhooks( '', 0 ) );
|
||||||
|
$this->assertFalse( isset( $wp_filter['woocommerce_one_test'] ) );
|
||||||
|
$this->assertFalse( isset( $wp_filter['woocommerce_two_test'] ) );
|
||||||
|
|
||||||
$this->assertTrue( wc_load_webhooks( '', 1 ) );
|
$this->assertTrue( wc_load_webhooks( '', 1 ) );
|
||||||
$this->assertFalse( isset( $wp_filter['woocommerce_one_test'] ) );
|
$this->assertFalse( isset( $wp_filter['woocommerce_one_test'] ) );
|
||||||
$this->assertTrue( isset( $wp_filter['woocommerce_two_test'] ) );
|
$this->assertTrue( isset( $wp_filter['woocommerce_two_test'] ) );
|
||||||
|
|
Loading…
Reference in New Issue