Changeset 4590

Timestamp:

12/24/2016 10:13:06 PM (9 years ago)

Author:

iandunn

Message:

WordCamp Base: Update Custom CSS output mode for Jetpack 4.4.2

Jetpack 4.4.2 uses a theme_mod to store the output mode now. This should have been done at the same time as r4577 and r4578, but since it was missed, the Base stylesheets were always being output, leading to layout problems.

See ​https://wordpress.slack.com/archives/meta-wordcamp/p1482565098000606

Location:

sites/trunk/wordcamp.org/public_html/wp-content/themes

Files:

• wordcamp-base-v2/lib/structure/class-wcb-structure.php (modified) (2 diffs)
• wordcamp-base/lib/structure/class-wcb-structure.php (modified) (2 diffs)

sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base-v2/lib/structure/class-wcb-structure.php

@@ -1 +1 @@
 <?php
+
+use WordCamp\RemoteCSS;
 
 class WCB_Structure extends WCB_Loader {
@@ -41 +43 @@
         $grid  = wcb_get_option('grid');
 
-        // Check whethec Custom CSS mode is set to Add or Replace.
-        if ( class_exists( 'Jetpack_Custom_CSS' ) && method_exists( 'Jetpack_Custom_CSS', 'get_current_revision' ) ) {
-            $safecss_post = Jetpack_Custom_CSS::get_current_revision();
-            if ( get_post_meta( $safecss_post['ID'], 'custom_css_add', true ) == 'no' )
-                return;
+        // Don't output CSS if Jetpack Custom CSS/RemoteCSS is set to 'replace' mode
+        if ( 'replace' === RemoteCSS\get_output_mode() ) {
+            return;
         }
 

sites/trunk/wordcamp.org/public_html/wp-content/themes/wordcamp-base/lib/structure/class-wcb-structure.php

@@ -1 +1 @@
 <?php
+
+use WordCamp\RemoteCSS;
 
 class WCB_Structure extends WCB_Loader {
@@ -41 +43 @@
         $grid  = wcb_get_option('grid');
 
-        // Check whethec Custom CSS mode is set to Add or Replace.
-        if ( class_exists( 'Jetpack_Custom_CSS' ) && method_exists( 'Jetpack_Custom_CSS', 'get_current_revision' ) ) {
-            $safecss_post = Jetpack_Custom_CSS::get_current_revision();
-            if ( get_post_meta( $safecss_post['ID'], 'custom_css_add', true ) == 'no' )
-                return;
+        // Don't output CSS if Jetpack Custom CSS/RemoteCSS is set to 'replace' mode
+        if ( 'replace' === RemoteCSS\get_output_mode() ) {
+            return;
         }