Changeset 1991397

Timestamp:

12/11/2018 04:41:15 AM (7 years ago)

Author:

themeblvd

Message:

2.3.3

Location:

theme-blvd-layout-builder/trunk

Files:

• inc/admin/class-tb-layout-builder.php (modified) (1 diff)
• readme.txt (modified) (2 diffs)
• tb-builder.php (modified) (2 diffs)

theme-blvd-layout-builder/trunk/inc/admin/class-tb-layout-builder.php

@@ -4265 +4265 @@
     public function is_classic_editor( $screen = null ) {
 
-        if (
-            version_compare( $GLOBALS['wp_version'], '5', '<' ) ||
-            ( function_exists( 'classic_editor_init_actions' ) && 'replace' === get_option( 'classic-editor-replace' ) ) ||
-            isset( $_REQUEST['classic-editor'] )
-        ) {
-
-            if ( ! $screen ) {
-
-                $screen = get_current_screen();
-
-            }
-
-            if ( 'post' == $screen->base && 'page' == $screen->id ) {
-
-                if ( $this->is_supported_post_type( $screen->post_type ) ) {
-
-                    return true;
-
-                }
-            }
-        }
+        if ( ! $screen ) {
+            $screen = get_current_screen();
+        }
+
+        if ( 'post' != $screen->base || 'page' != $screen->id ) {
+            return false;
+        }
+
+        if ( ! $this->is_supported_post_type( $screen->post_type ) ) {
+            return false;
+        }
+
+        if ( version_compare( $GLOBALS['wp_version'], '5', '<' ) ) {
+            return true;
+        }
+
+        $is_classic_editor_plugin_installed = class_exists( 'Classic_Editor' );
+
+        /*
+         * It's too difficult to determine accurately if classic editor
+         * should show; so I'm just going to plop it in the edit page
+         * screen when the plugin is installed.
+         */
+        if ( $is_classic_editor_plugin_installed ) {
+            return true;
+        }
+
+        // if ( ! $is_classic_editor_plugin_installed ) {
+        //  return false;
+        // }
+
+        // if ( isset( $_REQUEST['classic-editor'] ) ) {
+        //  return true;
+        // }
+
+        // $option = get_option( 'classic-editor-replace' );
+
+        // if ( $option === 'block' || $option === 'no-replace' ) { // Backwards compat for option.
+        //  $editor = 'block';
+        // } else {
+        //  // empty( $option ) || $option === 'classic' || $option === 'replace'.
+        //  $editor = 'classic';
+        // }
+
+        // $allow_users = ( 'allow' === get_option( 'classic-editor-allow-users' ) );
+
+        // if ( 'classic' === $editor && ! $allow_users ) {
+        //  return true;
+        // }
+
+        // if ( $allow_users && 'classic' === get_user_option( 'classic-editor-settings' ) ) {
+        //  return true;
+        // }
 
         return false;

theme-blvd-layout-builder/trunk/readme.txt

@@ -3 +3 @@
 Contributors: themeblvd
 Tags: layouts, custom, homepage, builder, Theme Blvd, themeblvd, Jason Bobich
-Stable Tag: 2.3.2
+Stable Tag: 2.3.3
 Tested up to: 5.0
 
@@ -46 +46 @@
 
 == Changelog ==
+
+= 2.3.3 - 12/10/2018 =
+* Fixed: Classic editor's legacy layout builder not displaying because of recent updates to the official Classic Editor plugin.
 
 = 2.3.2 - 11/20/2018 =

theme-blvd-layout-builder/trunk/tb-builder.php

@@ -3 +3 @@
 Plugin Name: Theme Blvd Layout Builder
 Description: When using a Theme Blvd theme, this plugin gives you slick interface to build custom layouts.
-Version: 2.3.2
+Version: 2.3.3
 Author: Theme Blvd
 Author URI: http://themeblvd.com
@@ -9 +9 @@
 */
 
-define( 'TB_BUILDER_PLUGIN_VERSION', '2.3.2' );
+define( 'TB_BUILDER_PLUGIN_VERSION', '2.3.3' );
 define( 'TB_BUILDER_PLUGIN_DIR', dirname( __FILE__ ) );
 define( 'TB_BUILDER_PLUGIN_URI', plugins_url( '' , __FILE__ ) );