Merge pull request #407 from cloudinary/fix/pgw-archive

pereirinha · web-flow · commit 775d503b75d3 · 2021-04-14T16:23:30.000+01:00
Fix PGW archive
diff --git a/php/media/class-gallery.php b/php/media/class-gallery.php
@@ -409,6 +409,9 @@ public function prepare_block_render( $content, $block ) {
 			return $content;
 		}
 
+		// Ensure library is enqueued. Deals with archive pages that render the content.
+		$this->enqueue_gallery_library();
+
 		$attributes = Utils::expand_dot_notation( $block['attrs'], '_' );
 		$attributes = array_merge( self::$default_config, $attributes );
 
@@ -490,6 +493,11 @@ protected function maybe_enqueue_scripts() {
 			}
 		}
 
+		// Bail enqueuing the script several times.
+		if ( wp_script_is( self::GALLERY_LIBRARY_HANDLE ) ) {
+			$can = false;
+		}
+
 		/**
 		 * Filter the enqueue of gallery script.
 		 *

Original file line number	Diff line number	Diff line change
`@@ -409,6 +409,9 @@ public function prepare_block_render( $content, $block ) {`
`409`	`409`	`return $content;`
`410`	`410`	`}`
`411`	`411`
	`412`	`+ // Ensure library is enqueued. Deals with archive pages that render the content.`
	`413`	`+ $this->enqueue_gallery_library();`
	`414`	`+`
`412`	`415`	`$attributes = Utils::expand_dot_notation( $block['attrs'], '_' );`
`413`	`416`	`$attributes = array_merge( self::$default_config, $attributes );`
`414`	`417`
`@@ -490,6 +493,11 @@ protected function maybe_enqueue_scripts() {`
`490`	`493`	`}`
`491`	`494`	`}`
`492`	`495`
	`496`	`+ // Bail enqueuing the script several times.`
	`497`	`+ if ( wp_script_is( self::GALLERY_LIBRARY_HANDLE ) ) {`
	`498`	`+ $can = false;`
	`499`	`+ }`
	`500`	`+`
`493`	`501`	`/**`
`494`	`502`	`* Filter the enqueue of gallery script.`
`495`	`503`	`*`