Merge branch 'release/2.29.16'

siteorigin · May 13, 2024 · c25cd9d · c25cd9d
2 parents 356fe90 + 26f4c35
commit c25cd9d
Show file tree

Hide file tree

Showing 7 changed files with 196 additions and 138 deletions.
diff --git a/build b/build
diff --git a/inc/admin-layouts.php b/inc/admin-layouts.php
@@ -254,37 +254,43 @@ public function action_get_prebuilt_layouts() {
 				return false;
 			}
 
-			$url = add_query_arg( $query, $directory[ 'url' ] . 'wp-admin/admin-ajax.php?action=query_layouts' );
+			$cache = get_transient( 'siteorigin_panels_layouts_directory_' . $directory_id .'_page_' . $page_num );
+			if ( empty( $search ) && ! empty( $cache ) ) {
+				$return = $cache;
+			} else {
+				$url = add_query_arg( $query, $directory[ 'url' ] . 'wp-admin/admin-ajax.php?action=query_layouts' );
+
+				if ( ! empty( $directory['args'] ) && is_array( $directory['args'] ) ) {
+					$url = add_query_arg( $directory['args'], $url );
+				}
 
-			if ( ! empty( $directory[ 'args' ] ) && is_array( $directory[ 'args' ] ) ) {
-				$url = add_query_arg( $directory[ 'args' ], $url );
-			}
+				$url = apply_filters( 'siteorigin_panels_layouts_directory_url', $url );
+				$response = wp_remote_get( esc_url( $url ) );
 
-			$url = apply_filters( 'siteorigin_panels_layouts_directory_url', $url );
-			$response = wp_remote_get( esc_url( $url ) );
+				if (
+					! is_wp_error( $response ) &&
+					is_array( $response ) &&
+					$response['response']['code'] == 200
+				) {
+					$results = json_decode( $response['body'], true );
 
-			if (
-				! is_wp_error( $response ) &&
-				is_array( $response ) &&
-				$response['response']['code'] == 200
-			) {
-				$results = json_decode( $response['body'], true );
+					if ( ! empty( $results ) && ! empty( $results['items'] ) ) {
+						foreach ( $results['items'] as $item ) {
+							$item['id'] = esc_html( $item['slug'] );
+							$item['type'] = esc_html( $type );
 
-				if ( ! empty( $results ) && ! empty( $results['items'] ) ) {
-					foreach ( $results['items'] as $item ) {
-						$item['id'] = esc_html( $item['slug'] );
-						$item['type'] = esc_html( $type );
+							if ( empty( $item['screenshot'] ) && ! empty( $item['preview'] ) ) {
+								$preview_url = add_query_arg( 'screenshot', 'true', $item[ 'preview' ] );
+								$item['screenshot'] = esc_url( 'https://s.wordpress.com/mshots/v1/' . urlencode( $preview_url ) . '?w=700' );
+							}
 
-						if ( empty( $item['screenshot'] ) && ! empty( $item['preview'] ) ) {
-							$preview_url = add_query_arg( 'screenshot', 'true', $item[ 'preview' ] );
-							$item['screenshot'] = esc_url( 'https://s.wordpress.com/mshots/v1/' . urlencode( $preview_url ) . '?w=700' );
+							$return['items'][] = $item;
 						}
-
-						$return['items'][] = $item;
 					}
-				}
 
-				$return['max_num_pages'] = $results['max_num_pages'];
+					$return['max_num_pages'] = $results['max_num_pages'];
+					set_transient( 'siteorigin_panels_layouts_directory_' . $directory_id .'_page_' . $page_num, $return, 86400 );
+				}
 			}
 		} elseif ( strpos( $type, 'clone_' ) !== false ) {
 			// Check that the user can view the given page types

diff --git a/inc/admin-widget-dialog.php b/inc/admin-widget-dialog.php
@@ -4,7 +4,7 @@ class SiteOrigin_Panels_Admin_Widget_Dialog {
 
 	public function __construct() {
 		add_filter( 'siteorigin_panels_widgets', array( $this, 'add_recommended_widgets' ) );
-		add_filter( 'siteorigin_panels_widget_dialog_tabs', array( $this, 'add_widgets_dialog_tabs' ), 20 );
+		add_filter( 'siteorigin_panels_widget_dialog_tabs', array( $this, 'add_widgets_dialog_tabs' ), 1 );
 	}
 
 	/**
@@ -97,16 +97,24 @@ public function add_widgets_dialog_tabs( $tabs ) {
 			return $stored_tabs;
 		}
 
-		$tabs['widgets_bundle'] = array(
-			'title'  => __( 'Widgets Bundle', 'siteorigin-panels' ),
+		$tabs[] = array(
+			'title'  => __( 'All Widgets', 'siteorigin-panels' ),
+			'filter' => array(
+				'installed' => true,
+				'groups'    => '',
+			),
+		);
+
+		$widgets_bundle = array(
+			'title'  => __( 'SiteOrigin Widgets Bundle', 'siteorigin-panels' ),
 			'filter' => array(
 				'groups' => array( 'so-widgets-bundle' ),
 			),
 		);
 
 		if ( class_exists( 'SiteOrigin_Widgets_Bundle' ) ) {
 			// Add a message about enabling more widgets
-			$tabs['widgets_bundle']['message'] = preg_replace(
+			$widgets_bundle['message'] = preg_replace(
 				array(
 					'/1\{ *(.*?) *\}/',
 				),
@@ -117,17 +125,20 @@ public function add_widgets_dialog_tabs( $tabs ) {
 			);
 		} else {
 			// Add a message about installing the widgets bundle
-			$tabs['widgets_bundle']['message'] = preg_replace(
+			$widgets_bundle['message'] = preg_replace(
 				'/1\{ *(.*?) *\}/',
 				'<a href="' . siteorigin_panels_plugin_activation_install_url( 'so-widgets-bundle', __( 'SiteOrigin Widgets Bundle', 'siteorigin-panels' ) ) . '">$1</a>',
 				__( 'Install the 1{Widgets Bundle} to get extra widgets.', 'siteorigin-panels' )
 			);
 		}
 
+
 		// Add the Widgets Bundle message to the main widgets tab
-		$tabs[0]['message'] = $tabs['widgets_bundle']['message'];
+		$tabs[0]['message'] = $widgets_bundle['message'];
+
+		$tabs[] = $widgets_bundle;
 
-		$tabs['page_builder'] = array(
+		$tabs[] = array(
 			'title'   => __( 'Page Builder Widgets', 'siteorigin-panels' ),
 			'message' => preg_replace(
 				array(
@@ -143,7 +154,7 @@ public function add_widgets_dialog_tabs( $tabs ) {
 			),
 		);
 
-		$tabs['wordpress'] = array(
+		$tabs[] = array(
 			'title'  => __( 'WordPress Widgets', 'siteorigin-panels' ),
 			'filter' => array(
 				'groups' => array( 'wordpress' ),
@@ -152,7 +163,7 @@ public function add_widgets_dialog_tabs( $tabs ) {
 
 		// Check for woocommerce plugin.
 		if ( defined( 'WOOCOMMERCE_VERSION' ) ) {
-			$tabs['woocommerce'] = array(
+			$tabs[] = array(
 				// TRANSLATORS: The name of WordPress plugin
 				'title'  => __( 'WooCommerce', 'woocommerce' ),
 				'filter' => array(
@@ -163,7 +174,7 @@ public function add_widgets_dialog_tabs( $tabs ) {
 
 		// Check for jetpack plugin.
 		if ( defined( 'JETPACK__VERSION' ) ) {
-			$tabs['jetpack'] = array(
+			$tabs[] = array(
 				// TRANSLATORS: The name of WordPress plugin
 				'title'  => __( 'Jetpack', 'jetpack' ),
 				'filter' => array(
@@ -174,7 +185,7 @@ public function add_widgets_dialog_tabs( $tabs ) {
 
 		// Check for bbpress plugin.
 		if ( function_exists( 'bbpress' ) ) {
-			$tabs['bbpress'] = array(
+			$tabs[] = array(
 				// TRANSLATORS: The name of WordPress plugin
 				'title'  => __( 'BBPress', 'bbpress' ),
 				'filter' => array(
@@ -199,7 +210,7 @@ public function add_widgets_dialog_tabs( $tabs ) {
 		}
 
 		if ( ! empty( $recommendedWidgets ) ) {
-			$tabs['recommended'] = array(
+			$tabs[] = array(
 				'title'  => __( 'Recommended Widgets', 'siteorigin-panels' ),
 				'filter' => array(
 					'groups' => array( 'recommended' ),