← All changes
|
extensions/blocks/cookie-consent/cookie-consent.php
+47
-2
13.0.2
→
16.3-a.5
View file →
| @@ -11,8 +11,12 @@ | ||
| 11 | 11 | |
| 12 | 12 | use Automattic\Jetpack\Blocks; |
| 13 | 13 | use Jetpack_Gutenberg; |
| 14 | 14 | |
| 15 | +if ( ! defined( 'ABSPATH' ) ) { | |
| 16 | + exit( 0 ); | |
| 17 | +} | |
| 18 | + | |
| 15 | 19 | const COOKIE_NAME = 'eucookielaw'; |
| 16 | 20 | |
| 17 | 21 | /** |
| 18 | 22 | * Should the block be registered? |
| @@ -46,11 +50,11 @@ | ||
| 46 | 50 | } |
| 47 | 51 | |
| 48 | 52 | Blocks::jetpack_register_block( |
| 49 | 53 | __DIR__, |
| 50 | - array( 'render_callback' => __NAMESPACE__ . '\load_assets' ), | |
| 51 | 54 | array( |
| 52 | - 'attributes' => array( | |
| 55 | + 'render_callback' => __NAMESPACE__ . '\load_assets', | |
| 56 | + 'attributes' => array( | |
| 53 | 57 | 'render_from_template' => array( |
| 54 | 58 | 'default' => false, |
| 55 | 59 | 'type' => 'boolean', |
| 56 | 60 | ), |
| @@ -73,8 +77,21 @@ | ||
| 73 | 77 | // This is needed for when the cookie expires, |
| 74 | 78 | // and we should send fresh HTML with the cookie block in it. |
| 75 | 79 | notify_batcache_that_content_changed(); |
| 76 | 80 | |
| 81 | + if ( | |
| 82 | + /** | |
| 83 | + * Filters the display of the Cookie-consent Block e.g by GDPR CMP banner on WordAds sites. | |
| 84 | + * | |
| 85 | + * @since 13.2 | |
| 86 | + * | |
| 87 | + * @param bool $disable_cookie_consent_block Whether to disable the Cookie-consent Block. | |
| 88 | + */ | |
| 89 | + apply_filters( 'jetpack_disable_cookie_consent_block', false ) | |
| 90 | + ) { | |
| 91 | + return ''; | |
| 92 | + } | |
| 93 | + | |
| 77 | 94 | // If the user has already accepted the cookie consent, don't show the block. |
| 78 | 95 | if ( isset( $_COOKIE[ COOKIE_NAME ] ) ) { |
| 79 | 96 | return ''; |
| 80 | 97 | } |
| @@ -88,8 +105,13 @@ | ||
| 88 | 105 | * Enqueue necessary scripts and styles. |
| 89 | 106 | */ |
| 90 | 107 | Jetpack_Gutenberg::load_assets_as_required( __DIR__ ); |
| 91 | 108 | |
| 109 | + /* | |
| 110 | + * Add a fallback color to block styles. | |
| 111 | + */ | |
| 112 | + $content = add_css_fallback_values( $content ); | |
| 113 | + | |
| 92 | 114 | return sprintf( |
| 93 | 115 | '<div class="%1$s">%2$s</div>', |
| 94 | 116 | esc_attr( Blocks::classes( Blocks::get_block_feature( __DIR__ ), $attr ) ), |
| 95 | 117 | $content |
| @@ -154,4 +176,27 @@ | ||
| 154 | 176 | ); |
| 155 | 177 | } |
| 156 | 178 | |
| 157 | 179 | add_action( 'rest_api_init', __NAMESPACE__ . '\cookie_consent_register_settings' ); |
| 180 | + | |
| 181 | +/** | |
| 182 | + * Add a fallback color to block styles. | |
| 183 | + * | |
| 184 | + * @since 15.1 | |
| 185 | + * | |
| 186 | + * @param string $content The block content. | |
| 187 | + * @return string The content with fallback values added to CSS custom properties. | |
| 188 | + */ | |
| 189 | +function add_css_fallback_values( $content ) { | |
| 190 | + // Define the CSS custom properties and their fallback values. | |
| 191 | + $css_fallbacks = array( | |
| 192 | + 'var(--wp--preset--color--contrast)' => 'var(--wp--preset--color--contrast, #000000)', | |
| 193 | + 'var(--wp--preset--color--tertiary)' => 'var(--wp--preset--color--tertiary, #f0f0f0)', | |
| 194 | + ); | |
| 195 | + | |
| 196 | + // Replace CSS custom properties with their fallback versions. | |
| 197 | + foreach ( $css_fallbacks as $original => $with_fallback ) { | |
| 198 | + $content = str_replace( $original, $with_fallback, $content ); | |
| 199 | + } | |
| 200 | + | |
| 201 | + return $content; | |
| 202 | +} | |