| @@ -544,9 +544,22 @@ | ||
| 544 | 544 | |
| 545 | 545 | function wpbc_can_i_load_on__resources_page() { |
| 546 | 546 | |
| 547 | 547 | if ( |
| 548 | - ( isset( $_REQUEST['page'] ) ) && ( $_REQUEST['page'] === 'wpbc-resources' ) // phpcs:ignore WordPress.Security.NonceVerification.Recommended | |
| 548 | + ( isset( $_REQUEST['page'] ) ) | |
| 549 | + && ( | |
| 550 | + ( $_REQUEST['page'] === 'wpbc-resources' ) // phpcs:ignore WordPress.Security.NonceVerification.Recommended | |
| 551 | + || ( | |
| 552 | + ( $_REQUEST['page'] === 'wpbc-booking-resources' ) // phpcs:ignore WordPress.Security.NonceVerification.Recommended | |
| 553 | + && function_exists( 'wpbc_is_11_6_features_enabled' ) | |
| 554 | + && wpbc_is_11_6_features_enabled() | |
| 555 | + ) | |
| 556 | + || ( | |
| 557 | + ( $_REQUEST['page'] === 'wpbc-catalog-booking-resources' ) // phpcs:ignore WordPress.Security.NonceVerification.Recommended | |
| 558 | + && function_exists( 'wpbc_is_11_6_features_enabled' ) | |
| 559 | + && wpbc_is_11_6_features_enabled() | |
| 560 | + ) | |
| 561 | + ) | |
| 549 | 562 | ) { |
| 550 | 563 | return true; |
| 551 | 564 | } |
| 552 | 565 | |
| @@ -583,9 +596,15 @@ | ||
| 583 | 596 | * @return bool |
| 584 | 597 | */ |
| 585 | 598 | function wpbc_can_i_load_on_this_page__modal_search_options() { |
| 586 | 599 | |
| 587 | - if ( wpbc_can_i_load_on__searchable_resources_page() ){ | |
| 600 | + if ( | |
| 601 | + wpbc_can_i_load_on__searchable_resources_page() | |
| 602 | + || ( | |
| 603 | + function_exists( 'wpbc_catalog_searchable_resources_is_page' ) | |
| 604 | + && wpbc_catalog_searchable_resources_is_page() | |
| 605 | + ) | |
| 606 | + ) { | |
| 588 | 607 | return true; |
| 589 | 608 | } else { |
| 590 | 609 | return false; |
| 591 | 610 | } |