elementor/activity-log
1
0
Fork 0
mirror of https://ghproxy.net/https://github.com/elementor/activity-log.git synced 2025-10-04 22:37:34 +08:00
Code Issues Packages Activity Actions

Merge branch 'develop'

Browse source
This commit is contained in:
Yakir Sitbon 2021-02-15 11:38:36 +02:00
commit eae25f07ff
3 changed files with 14 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
aryo-activity-log.php
View file

@ -95,7 +95,7 @@ final class AAL_Main {
*/
protected function __construct() {
global $wpdb;

$this->ui = new AAL_Admin_Ui();
$this->hooks = new AAL_Hooks();
$this->settings = new AAL_Settings();

14
classes/class-aal-integration-woocommerce.php
View file

@ -6,11 +6,12 @@ class AAL_Integration_WooCommerce {
private $_wc_options = array();

public function init() {
if ( ! class_exists( 'Woocommerce' ) )
if ( ! class_exists( 'Woocommerce' ) ) {
return;
}

add_filter( 'aal_whitelist_options', array( &$this, 'wc_aal_whitelist_options' ) );
add_filter( 'woocommerce_get_settings_pages', array( &$this, 'wc_get_settings_pages' ), 9999 );
add_filter( 'aal_whitelist_options', array( $this, 'wc_aal_whitelist_options' ) );
add_filter( 'woocommerce_get_settings_pages', array( $this, 'wc_get_settings_pages' ), 9999 );
}

/**
@ -27,9 +28,14 @@ class AAL_Integration_WooCommerce {
$this->_wc_options = array();

foreach ( $settings as $setting ) {
if ( 'advanced' === $setting->get_id() ) {
continue;
}

foreach ( $setting->get_settings() as $option ) {
if ( isset( $option['id'] ) && ( ! isset( $option['type'] ) || ! in_array( $option['type'], $wc_exclude_types ) ) )
if ( isset( $option['id'] ) && ( ! isset( $option['type'] ) || ! in_array( $option['type'], $wc_exclude_types ) ) ) {
$this->_wc_options[] = $option['id'];
}
}
}
}

3
readme.txt
View file

@ -112,6 +112,9 @@ Would you like to like to contribute to Activity Log? You are more than welcome

== Changelog ==

= 2.6.1 - 2021-02-15 =
* Fix: Conflict with WooCommerce while you using new editor

= 2.6.0 - 2020-10-19 =
* Tweak: Added support for CloudFlare and CloudFlare Enterprise client IP header ([#133](https://github.com/pojome/activity-log/issues/133))
* Tweak: Added browser confirmation to Reset Database option