Merge branch 'release/2.16.8'

inc/admin-layouts.php

@@ -158,12 +158,27 @@ private function get_layout_id( $layout_data, $fallback ) {
 			return $fallback;
 		}
 	}
+
+	static private function get_files( $folder_path, $file_name ) {
+		$paths = array();
+		$types = array (
+			'jpg',
+			'jpeg',
+			'gif',
+			'png',
+		);
+		foreach ( $types as $ext ) {
+			$paths = array_merge( glob( $folder_path . "/$file_name.$ext" ), $paths );
+		}
+
+		return $paths;
+	}
 
 	private function get_layout_file_screenshot( $panels_data, $folder_path, $file_name ) {
 		if ( ! empty( $panels_data['screenshot'] ) ) {
 			return $panels_data['screenshot'];
 		} else {
-			$paths = glob( $folder_path . "/$file_name.{jpg,jpeg,gif,png}", GLOB_BRACE );
+			$paths = self::get_files( $folder_path, $file_name );
 			// Highlander Condition. There can be only one.
 			$screenshot_path = empty( $paths ) ? '' : wp_normalize_path( $paths[0] );
 			$wp_content_dir = wp_normalize_path( WP_CONTENT_DIR );

inc/renderer.php

@@ -487,7 +487,9 @@ function render( $post_id = false, $enqueue_css = true, $panels_data = false, &
 		echo apply_filters( 'siteorigin_panels_before_content', '', $panels_data, $post_id );
 
 		foreach ( $layout_data as $ri => & $row ) {
-			$this->render_row( $post_id, $ri, $row, $panels_data );
+			if ( apply_filters( 'siteorigin_panels_output_row', true, $row, $ri, $panels_data, $post_id ) ) {
+				$this->render_row( $post_id, $ri, $row, $panels_data );
+			}
 		}
 
 		echo apply_filters( 'siteorigin_panels_after_content', '', $panels_data, $post_id );
@@ -1018,7 +1020,9 @@ private function render_cell( $post_id, $ri, $ci, & $cell, $cells, & $panels_dat
 
 		foreach ( $cell['widgets'] as $wi => & $widget ) {
 			$is_last = ( $wi == count( $cell['widgets'] ) - 1 );
-			$this->render_widget( $post_id, $ri, $ci, $wi, $widget, $is_last );
+			if ( apply_filters( 'siteorigin_panels_output_widget', true, $widget, $ri, $ci, $wi, $panels_data, $post_id ) ) {
+				$this->render_widget( $post_id, $ri, $ci, $wi, $widget, $is_last );
+			}
 		}
 
 		// This allows other themes and plugins to add HTML inside of the cell after its contents.

readme.txt

@@ -107,6 +107,10 @@ SiteOrigin Premium includes access to our professional email support service, pe
 
 == Changelog ==
 
+= 2.16.8 - 30 March 2022 =
+* Improved PHP 8 Compatibility: Replaced `GLOB_BRACE` flag in favor of multiple `glob` functions.
+* Developer: Added `siteorigin_panels_output_row` and `siteorigin_panels_output_widget` filters.
+
 = 2.16.7 - 23 March 2022 =
 * Improved empty CSS rule check to avoid potential edge cases.