Issue#27673

admin/blocks/main.php

@@ -100,11 +100,11 @@ public function compilePageGlobalBlocks( $config, $context ) {
 			$config['globalBlocks'] = [];
 		}
 		$tmp                    = array_merge( $config['globalBlocks'], $blockManager->createResponseForEntities( $blocks, [], $context ) );
-		$config['globalBlocks'] = array_reduce( $tmp, function ( $result, $object ) {
+		$config['globalBlocks'] = array_values( array_reduce( $tmp, function ( $result, $object ) {
 			$result[ $object['uid'] ] = $object;
 
 			return $result;
-		}, [] );
+		}, [] ) );
 
 		return $config;
 	}
@@ -204,12 +204,10 @@ public function getMatchingBrizyBlocks( $wpPost = null ) {
 				$wpPost = get_post( $ruleMatches[0]['entityValues'][0] );
 			}
 		}
-
 		$matching_blocks = [];
 		if ( count( $ruleMatches ) ) {
 			$matching_blocks = $this->findMatchingBlocks( $ruleMatches );
 		}
-
 		$referenced = [];
 		if ( $wpPost ) {
 			try {

editor.php

@@ -409,35 +409,31 @@ private function initializeAssetLoaders() {
 	 * =====================================================================================================
 	 * =====================================================================================================
 	 */
-	function currentPostId() {
-		$pid = null;
-		global $wp_query;
-
-		if ( isset( $_REQUEST['post'] ) ) {
-			$pid = (int) $_REQUEST['post'];
-		} elseif
-		( isset( $_REQUEST['page_id'] ) ) {
-			$pid = (int) $_REQUEST['page_id'];
-		} elseif
-		( isset( $_REQUEST['post_ID'] ) ) {
-			$pid = (int) $_POST['post_ID'];
-		} elseif
-		( isset( $_REQUEST['id'] ) ) {
-			$pid = (int) $_REQUEST['id'];
-		} elseif
-		( isset( $_REQUEST[ Brizy_Editor::prefix( '_post' ) ] ) ) {
-			$pid = (int) $_REQUEST[ Brizy_Editor::prefix( '_post' ) ];
-		} elseif ( $wp_query && $wp_query->is_posts_page ) {
-			$pid = (int) get_queried_object_id();
-		} elseif
-		( $wp_query && ( $apid = get_queried_object_id() ) && ( is_single() || is_page() ) && $wp_query->queried_object instanceof WP_Post ) {
-			$pid = (int) $apid;
-		} elseif ( function_exists( 'is_shop' ) && is_shop() ) {
-			$pid = wc_get_page_id( 'shop' );
-		}
-
-		return $pid;
-	}
+    function currentPostId()
+    {
+        $pid = null;
+        global $wp_query;
+
+        if ($wp_query && $wp_query->is_posts_page) {
+            $pid = absint(get_queried_object_id());
+        } elseif ($wp_query && ($apid = get_queried_object_id()) && (is_single() || is_page()) && $wp_query->queried_object instanceof WP_Post) {
+            $pid = absint($apid);
+        } elseif (function_exists('is_shop') && is_shop()) {
+            $pid = wc_get_page_id('shop');
+        } elseif (isset($_REQUEST[Brizy_Editor::prefix('_post')])) {
+            $pid = absint($_REQUEST[Brizy_Editor::prefix('_post')]);
+        } elseif (isset($_REQUEST['post'])) {
+            $pid = absint($_REQUEST['post']);
+        } elseif (isset($_REQUEST['page_id'])) {
+            $pid = absint($_REQUEST['page_id']);
+        } elseif (isset($_REQUEST['post_ID'])) {
+            $pid = absint($_REQUEST['post_ID']);
+        } elseif (isset($_REQUEST['id'])) {
+            $pid = absint($_REQUEST['id']);
+        }
+
+        return $pid;
+    }
 
 	static public function get_slug() {
 		return apply_filters( 'brizy-slug', 'brizy' );

editor/api.php

@@ -93,6 +93,7 @@ protected function initializeApiActions() {
         add_action($p . self::AJAX_MEDIA_METAKEY, array($this, 'get_media_key'));
         add_action($p . self::AJAX_CREATE_ATTACHMENT_UID, array($this, 'get_attachment_key'));
         add_action($p . self::AJAX_SET_FEATURED_IMAGE, array($this, 'set_featured_image'));
+        add_action($p . self::AJAX_REMOVE_FEATURED_IMAGE, array($this, 'remove_featured_image'));
         add_action($p . self::AJAX_SET_IMAGE_FOCAL_PT, array($this, 'set_featured_image_focal_point'));
         add_action($p . self::AJAX_TIMESTAMP, array($this, 'timestamp'));
         add_action($p . self::AJAX_SET_TEMPLATE_TYPE, array($this, 'setTemplateType'));

editor/compiler.php

@@ -59,6 +59,10 @@ public function needsCompile( Brizy_Editor_Post $post ) {
 		$currentCompiler = preg_replace( "/((beta\d?)?-wp)$/", "", $post->get_compiler_version() );
 		$v2              = preg_replace( "/((beta\d?)?-wp)$/", "", BRIZY_MINIMUM_COMPILER_VERSION );
 
+		if(BRIZY_EDITOR_VERSION=='dev') {
+			$v2 = BRIZY_EDITOR_VERSION;
+		}
+
 		if ( version_compare( $currentCompiler, $v2, "<" ) ) {
             return true;
 		}

editor/crop-cache-media.php

@@ -235,8 +235,33 @@ private function getImgUrlByWpSize( $uid, $size ) {
 			$imgUrl = $this->getImgUrlByWpSize( $uid, 'full' );
 		}
 
-		return $imgUrl;
-	}
+        return $this->replaceCdnUrl($imgUrl);
+    }
+
+    /**
+     * Replaces the CDN domain in the image URL with the server's domain.
+     *
+     * @param  string  $imgUrl  The original image URL.
+     * @return string The updated image URL with the server domain and without query parameters.
+     */
+    private function replaceCdnUrl(
+        string $imgUrl
+    ): string {
+        $server_domain = site_url();
+
+        $parsed_url = parse_url($imgUrl);
+        $img_domain = $parsed_url['scheme'].'://'.$parsed_url['host'];
+
+        $path = $parsed_url['path'] ?? '';
+
+        if ($img_domain !== $server_domain) {
+            $imgUrl = str_replace($img_domain, $server_domain, $img_domain.$path);
+        } else {
+            $imgUrl = $img_domain.$path;
+        }
+
+        return $imgUrl;
+    }
 
 	/**
 	 * @throws Exception
@@ -259,4 +284,4 @@ public function basename( $originalPath ) {
 	public function buildPath( ...$parts ) {
 		return implode( '/', $parts );
 	}
-}
+}