Full Site Editing - Version 3.51001

Version Description

Download this release

Release Info

Developer mmtr86
Plugin Icon wp plugin Full Site Editing
Version 3.51001
Comparing to
See all releases

Code changes from version 3.50993 to 3.51001

Files changed (4) hide show
  1. build_meta.txt +3 -3
  2. full-site-editing-plugin.php +2 -2
  3. readme.txt +1 -1
  4. wpcom-global-styles/index.php +16 -11
build_meta.txt CHANGED
@@ -1,3 +1,3 @@
1
- commit_hash=e67ae553e005e8570f16a8370c665e86fe572c5d
2
- commit_url=https://github.com/Automattic/wp-calypso/commit/e67ae553e005e8570f16a8370c665e86fe572c5d
3
- build_number=3.50993
1
+ commit_hash=f625d9413a69b7a03ae0de85d5d1b57a45a24234
2
+ commit_url=https://github.com/Automattic/wp-calypso/commit/f625d9413a69b7a03ae0de85d5d1b57a45a24234
3
+ build_number=3.51001
full-site-editing-plugin.php CHANGED
@@ -2,7 +2,7 @@
2
  /**
3
  * Plugin Name: WordPress.com Editing Toolkit
4
  * Description: Enhances your page creation workflow within the Block Editor.
5
- * Version: 3.50993
6
  * Author: Automattic
7
  * Author URI: https://automattic.com/wordpress-plugins/
8
  * License: GPLv2 or later
@@ -42,7 +42,7 @@ namespace A8C\FSE;
42
  *
43
  * @var string
44
  */
45
- define( 'A8C_ETK_PLUGIN_VERSION', '3.50993' );
46
 
47
  // Always include these helper files for dotcom FSE.
48
  require_once __DIR__ . '/dotcom-fse/helpers.php';
2
  /**
3
  * Plugin Name: WordPress.com Editing Toolkit
4
  * Description: Enhances your page creation workflow within the Block Editor.
5
+ * Version: 3.51001
6
  * Author: Automattic
7
  * Author URI: https://automattic.com/wordpress-plugins/
8
  * License: GPLv2 or later
42
  *
43
  * @var string
44
  */
45
+ define( 'A8C_ETK_PLUGIN_VERSION', '3.51001' );
46
 
47
  // Always include these helper files for dotcom FSE.
48
  require_once __DIR__ . '/dotcom-fse/helpers.php';
readme.txt CHANGED
@@ -3,7 +3,7 @@ Contributors: automattic
3
  Tags: block, blocks, editor, gutenberg, page
4
  Requires at least: 5.5
5
  Tested up to: 6.0
6
- Stable tag: 3.50993
7
  Requires PHP: 5.6.20
8
  License: GPLv2 or later
9
  License URI: https://www.gnu.org/licenses/gpl-2.0.html
3
  Tags: block, blocks, editor, gutenberg, page
4
  Requires at least: 5.5
5
  Tested up to: 6.0
6
+ Stable tag: 3.51001
7
  Requires PHP: 5.6.20
8
  License: GPLv2 or later
9
  License URI: https://www.gnu.org/licenses/gpl-2.0.html
wpcom-global-styles/index.php CHANGED
@@ -13,15 +13,15 @@
13
  */
14
  function wpcom_should_limit_global_styles( $blog_id = 0 ) {
15
  if ( ! $blog_id ) {
16
- $blog_id = get_current_blog_id();
17
- }
18
-
19
- // Do not limit Global Styles on Atomic sites for now, because blog stickers are not exposed
20
- // to these sites and the project is still in a development stage that requires sites to have
21
- // a certain blog sticker before restricting the feature. This is a temporary check that will
22
- // be removed as part of the public launch.
23
- if ( ! defined( 'IS_WPCOM' ) || ! IS_WPCOM ) {
24
- return false;
25
  }
26
 
27
  // Do not limit Global Styles on sites created before we made it a paid feature. This cutoff
@@ -34,8 +34,13 @@ function wpcom_should_limit_global_styles( $blog_id = 0 ) {
34
  return false;
35
  }
36
 
37
- // During the development stage, we only limit Global Styles on sites that have opted in. This
38
- // is a temporary check that will be removed as part of the public launch.
 
 
 
 
 
39
  return has_blog_sticker( 'wpcom-limit-global-styles', $blog_id );
40
  }
41
 
13
  */
14
  function wpcom_should_limit_global_styles( $blog_id = 0 ) {
15
  if ( ! $blog_id ) {
16
+ if ( defined( 'IS_WPCOM' ) && IS_WPCOM ) {
17
+ $blog_id = get_current_blog_id();
18
+ } elseif ( defined( 'IS_ATOMIC' ) && IS_ATOMIC ) {
19
+ $blog_id = method_exists( 'Jetpack_Options', 'get_option' )
20
+ ? (int) Jetpack_Options::get_option( 'id' )
21
+ : get_current_blog_id();
22
+ } else {
23
+ return false;
24
+ }
25
  }
26
 
27
  // Do not limit Global Styles on sites created before we made it a paid feature. This cutoff
34
  return false;
35
  }
36
 
37
+ // During the development stage, we only limit Global Styles on sites that have opted in via
38
+ // a blog sticker. This is a temporary check that will be removed as part of the public launch.
39
+ // Note that block stickers are not exposed by default to Atomic sites, so we're not limiting
40
+ // Global Styles on Atomic sites for now.
41
+ if ( ! function_exists( 'has_blog_sticker' ) ) {
42
+ return false;
43
+ }
44
  return has_blog_sticker( 'wpcom-limit-global-styles', $blog_id );
45
  }
46