Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Revert "Move capabilities check behind admin_init and is_admin" #353

Closed
wants to merge 1 commit into from
+11 −35
Closed

Revert "Move capabilities check behind admin_init and is_admin" #353

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
46 changes: 11 additions & 35 deletions includes/ECommerce.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -78,6 +78,9 @@ class ECommerce {
* @param Container $container Container loaded from the brand plugin.
*/
public function __construct( Container $container ) {
$capability = new SiteCapabilities();
$hasYithExtended = $capability->get( 'hasYithExtended' );
$canAccessGlobalCTB = $capability->get( 'canAccessGlobalCTB' );

$this->container = $container;
// Module functionality goes here
Expand Down Expand Up @@ -107,7 +110,14 @@ public function __construct( Container $container ) {
add_action( 'admin_enqueue_scripts', array( $this, 'set_wpnav_collapse_setting' ) );
add_action('admin_footer', array( $this, 'remove_woocommerce_ssl_notice' ), 20);

add_action( 'admin_init', array( $this, 'admin_init_conditional_on_capabilities' ) );
if ( ( $container->plugin()->id === 'bluehost' && ( $canAccessGlobalCTB || $hasYithExtended ) ) || ( $container->plugin()->id === 'hostgator' && $hasYithExtended ) ) {
add_filter( 'admin_menu', array( $this, 'custom_add_promotion_menu_item' ) );
add_action( 'woocommerce_product_options_general_product_data', array( $this, 'custom_product_general_options' ) );
add_action( 'woocommerce_product_options_related', array( $this, 'custom_product_general_options' ) );
add_action( 'woocommerce_product_data_tabs', array( $this, 'custom_product_write_panel_tabs' ) );
add_action( 'woocommerce_product_data_panels', array( $this, 'promotion_product_data' ) );
add_action( 'admin_head', array( $this, 'action_admin_head' ) );
}

// Handle WonderCart Integrations
if ( is_plugin_active( 'wonder-cart/init.php' ) ) {
Expand Down Expand Up @@ -611,40 +621,6 @@ public function remove_woocommerce_ssl_notice() {
}
}

/**
* Add actions and filters that are conditionally added depending on the Site's capabilities.
*
* Running the capabilities check after `admin_init` with `is_admin()` `true` ensures no HTTP requests are made
* for frontend page loads.
*
* `admin_init` runs in `wp-admin/admin.php:175`, `wp-admin/admin-ajax.php:45`, and `wp-admin/admin-post:30`.
* Each of the hooks in this function are UI (HTML) related, so only need to run inside `is_admin()`.
*
* @hooked admin_init
*/
public function admin_init_conditional_on_capabilities() {

if ( ! is_admin() ) {
return;
}

$capability = new SiteCapabilities();
$hasYithExtended = $capability->get( 'hasYithExtended' );
$canAccessGlobalCTB = $capability->get( 'canAccessGlobalCTB' );

if (
( $this->container->plugin()->id === 'bluehost' && ( $canAccessGlobalCTB || $hasYithExtended ) )
|| ( $this->container->plugin()->id === 'hostgator' && $hasYithExtended )
) {
add_filter( 'admin_menu', array( $this, 'custom_add_promotion_menu_item' ) );
add_action( 'woocommerce_product_options_general_product_data', array( $this, 'custom_product_general_options' ) );
add_action( 'woocommerce_product_options_related', array( $this, 'custom_product_general_options' ) );
add_action( 'woocommerce_product_data_tabs', array( $this, 'custom_product_write_panel_tabs' ) );
add_action( 'woocommerce_product_data_panels', array( $this, 'promotion_product_data' ) );
add_action( 'admin_head', array( $this, 'action_admin_head' ) );
}
}

/**
* Add custom column header for post/page/product screen
*
Expand Down
Loading