retain actions when using the classic editor plugin

thomasplevy · thomasplevy · commit 4e9ee4b8e3b3 · 2018-12-14T16:44:53.000-08:00
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,6 +1,12 @@
 LifterLMS Blocks Changelog
 ==========================
 
+v1.1.1 - 2018-12-14
+-------------------
+
++ Fix issue causing LifterLMS Core Actions to be removed when using the Classic Editor plugin.
+
+
 v1.1.0 - 2018-12-12
 -------------------
 
diff --git a/includes/class-llms-blocks-migrate.php b/includes/class-llms-blocks-migrate.php
@@ -4,7 +4,7 @@
  *
  * @package  LifterLMS_Blocks/Classes
  * @since    1.0.0
- * @version  1.1.0
+ * @version  1.1.1
  */
 
 defined( 'ABSPATH' ) || exit;
@@ -139,11 +139,11 @@ public function migrate_post() {
 	 *
 	 * @return  void
 	 * @since   1.1.0
-	 * @version 1.1.0
+	 * @version 1.1.1
 	 */
 	public function remove_template_hooks() {
 
-		if ( ! llms_parse_bool( get_post_meta( get_the_ID(), '_llms_blocks_migrated', true ) ) ) {
+		if ( ! llms_parse_bool( get_post_meta( get_the_ID(), '_llms_blocks_migrated', true ) ) || 'classic-editor' === get_post_meta( get_the_ID(), 'classic-editor-remember', true ) ) {
 			return;
 		}
 
diff --git a/lifterlms-blocks.php b/lifterlms-blocks.php
@@ -8,7 +8,7 @@
  * Plugin Name: LifterLMS Blocks
  * Plugin URI: https://github.com/gocodebox/lifterlms-blocks
  * Description: WordPress Editor (Gutenberg) blocks for LifterLMS.
- * Version: 1.1.0
+ * Version: 1.1.1
  * Author: LifterLMS
  * Author URI: https://lifterlms.com/
  * License: GPLv3
@@ -22,7 +22,7 @@
 
 // Define Constants.
 if ( ! defined( 'LLMS_BLOCKS_VERSION' ) ) {
-	define( 'LLMS_BLOCKS_VERSION', '1.1.0' );
+	define( 'LLMS_BLOCKS_VERSION', '1.1.1' );
 }
 
 /**
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "lifterlms-blocks",
-  "version": "1.1.0",
+  "version": "1.1.1",
   "description": "blocks",
   "author": "LifterLMS",
   "homepage": "https://lifterlms.com/",

Original file line number	Diff line number	Diff line change
`@@ -4,7 +4,7 @@`
`4`	`4`	`*`
`5`	`5`	`* @package LifterLMS_Blocks/Classes`
`6`	`6`	`* @since 1.0.0`
`7`		`- * @version 1.1.0`
	`7`	`+ * @version 1.1.1`
`8`	`8`	`*/`
`9`	`9`
`10`	`10`	`defined( 'ABSPATH' ) \|\| exit;`
`@@ -139,11 +139,11 @@ public function migrate_post() {`
`139`	`139`	`*`
`140`	`140`	`* @return void`
`141`	`141`	`* @since 1.1.0`
`142`		`- * @version 1.1.0`
	`142`	`+ * @version 1.1.1`
`143`	`143`	`*/`
`144`	`144`	`public function remove_template_hooks() {`
`145`	`145`
`146`		`- if ( ! llms_parse_bool( get_post_meta( get_the_ID(), '_llms_blocks_migrated', true ) ) ) {`
	`146`	`+ if ( ! llms_parse_bool( get_post_meta( get_the_ID(), '_llms_blocks_migrated', true ) ) \|\| 'classic-editor' === get_post_meta( get_the_ID(), 'classic-editor-remember', true ) ) {`
`147`	`147`	`return;`
`148`	`148`	`}`
`149`	`149`
Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "lifterlms-blocks",`
`3`		`- "version": "1.1.0",`
	`3`	`+ "version": "1.1.1",`
`4`	`4`	`"description": "blocks",`
`5`	`5`	`"author": "LifterLMS",`
`6`	`6`	`"homepage": "https://lifterlms.com/",`