From c4060929144ca0278b15a7421a770052d57654c9 Mon Sep 17 00:00:00 2001
From: Ravi Chandra <ravichandrach1@gmail.com>
Date: Thu, 18 Mar 2021 17:26:06 +0530
Subject: [PATCH] Fix undefined access error

---
 plugin/php/class-block-types.php | 14 +++++---------
 1 file changed, 5 insertions(+), 9 deletions(-)

diff --git a/plugin/php/class-block-types.php b/plugin/php/class-block-types.php
index 77c7aeb2..65417751 100644
--- a/plugin/php/class-block-types.php
+++ b/plugin/php/class-block-types.php
@@ -336,21 +336,17 @@ public function get_rest_controller( $post_type ) {
 		$class = $post_type->rest_controller_class ? $post_type->rest_controller_class : \WP_REST_Posts_Controller::class;
 
 		if ( ! class_exists( $class ) ) {
-				return null;
+			return null;
 		}
 
 		if ( ! is_subclass_of( $class, \WP_REST_Controller::class ) ) {
-				return null;
-		}
-
-		if ( ! $post_type->rest_controller ) {
-				$post_type->rest_controller = new $class( $post_type->name );
+			return null;
 		}
 
-		if ( ! ( $post_type->rest_controller instanceof $class ) ) {
-				return null;
+		if ( ! empty( $post_type->rest_controller ) ) {
+			return $post_type->rest_controller;
 		}
 
-		return $post_type->rest_controller;
+		return new $class( $post_type->name );
 	}
 }