Release 2.20.1 (#2002)

This release fixes an issue with View caching and improves compatibility
with the Advanced Custom Fields plugin.

#### 🐛 Fixed
- Disappearing pagination and incorrect entry count when View caching is
enabled.
- Potential timeout issue when embedding GravityView shortcodes with
Advanced Custom Fields plugin.
- PHP 8.1+ deprecation notice.

future/includes/class-gv-view.php

@@ -1461,18 +1461,23 @@ private function run_db_query( GF_Query $query ) {
 		if ( $long_lived_cache->use_cache() ) {
 			$cached_entries = $long_lived_cache->get();
 
-			if ( $cached_entries ) {
+			if ( is_array( $cached_entries ) && array_key_exists( 'entries', $cached_entries ) && array_key_exists( 'total', $cached_entries ) ) {
+				$query->total_found = $cached_entries['total'];
+
 				return [
-					$cached_entries,
+					$cached_entries['entries'],
 					$query,
 				];
 			}
 
-			$db_entries = $query->get();
+			$cached_entries = [
+				'entries' => $query->get(),
+				'total'   => $query->total_found,
+			];
 
-			if ( $long_lived_cache->set( $db_entries, 'entries' ) ) {
+			if ( $long_lived_cache->set( $cached_entries, 'entries' ) ) {
 				return [
-					$db_entries,
+					$cached_entries['entries'],
 					$query,
 				];
 			}

gravityview.php

@@ -3,7 +3,7 @@
  * Plugin Name:         GravityView
  * Plugin URI:          https://www.gravitykit.com
  * Description:         The best, easiest way to display Gravity Forms entries on your website.
- * Version:             2.20
+ * Version:             2.20.1
  * Author:              GravityKit
  * Author URI:          https://www.gravitykit.com
  * Text Domain:         gk-gravityview
@@ -27,7 +27,7 @@
 /**
  * The plugin version.
  */
-define( 'GV_PLUGIN_VERSION', '2.20' );
+define( 'GV_PLUGIN_VERSION', '2.20.1' );
 
 /**
  * Full path to the GravityView file

includes/class-admin-welcome.php

@@ -295,6 +295,18 @@ public function changelog_screen() {
 				 *  - If 4.28, include to 4.26.
 				 */
 				?>
+				<h3>2.20.1 on February 29, 2024</h3>
+
+				<p>This release fixes an issue with View caching and improves compatibility with the Advanced Custom Fields plugin.</p>
+
+				<h4>🐛 Fixed</h4>
+
+				<ul>
+					<li>Disappearing pagination and incorrect entry count when View caching is enabled.</li>
+					<li>Potential timeout issue when embedding GravityView shortcodes with Advanced Custom Fields plugin.</li>
+					<li>PHP 8.1+ deprecation notice.</li>
+				</ul>
+
 				<h3>2.20 on February 22, 2024</h3>
 
 				<p>This release introduces new settings for better control over View caching, adds support for the Advanced Post Creation Add-On when editing entries, fixes a fatal error when exporting entries to CSV, and updates internal components for better performance and compatibility.</p>
@@ -321,7 +333,7 @@ public function changelog_screen() {
 
 				<h4>🔧 Updated</h4>
 
-				<p><a href="https://www.gravitykit.com/foundation/">Foundation</a> to versions 1.2.9.</p>
+				<p><a href="https://www.gravitykit.com/foundation/">Foundation</a> to version 1.2.9.</p>
 
 				<ul>
 					<li>GravityKit products that are already installed can now be activated without a valid license.</li>
@@ -595,7 +607,12 @@ public function welcome() {
 
 		// Bail if no activation redirect
 		if ( ! get_transient( '_gv_activation_redirect' ) ) {
-			return; }
+			return;
+		}
+
+		if ( ( $_GET['page'] ?? '' ) === GravityKit\GravityView\Foundation\Licenses\Framework::ID ) {
+			return;
+		}
 
 		// Delete the redirect transient
 		delete_transient( '_gv_activation_redirect' );

includes/extensions/entry-notes/class-gravityview-field-notes.php

@@ -526,7 +526,7 @@ public static function display_note( $note, $show_delete = false, $context = nul
 		}
 
 		foreach ( $note_content as $tag => $value ) {
-			$note_detail_html = str_replace( '{' . $tag . '}', $value, $note_detail_html );
+			$note_detail_html = str_replace( '{' . $tag . '}', $value ?? '', $note_detail_html );
 		}
 
 		$replacements = array(

includes/plugin-and-theme-hooks/class-gravityview-plugin-hooks-acf.php

@@ -35,6 +35,15 @@ class GravityView_Plugin_Hooks_ACF extends GravityView_Plugin_and_Theme_Hooks {
 	 */
 	protected $style_handles = array( 'acf-global' );
 
+	/**
+	 * Microcache for keys by post id.
+	 *
+	 * @since $ver$
+	 *
+	 * @var array{int, mixed}
+	 */
+	private $keys = [];
+
 	/**
 	 * @since 1.16.5
 	 */
@@ -47,22 +56,52 @@ protected function add_hooks() {
 	}
 
 	/**
-	 * @param array    $meta_keys Existing meta keys to parse for [gravityview] shortcode
-	 * @param \WP_Post $post Current post ID
+	 * Retrieve the "Advanced Custom Field" field keys for the post.
 	 *
-	 * @return array
+	 * @since $ver$
+	 *
+	 * @param int $post_id The post id.
+	 *
+	 * @return array The ACF field keys.
 	 */
-	function add_meta_keys_from_post( $meta_keys = array(), $post = null ) {
+	private function get_acf_keys( int $post_id ): array {
+		// Can never be too careful: double-check that ACF is active and the functions exist.
+		if ( ! function_exists( 'acf_get_meta' ) || ! function_exists( 'acf_get_valid_post_id' ) || ! $post_id ) {
+			return [];
+		}
 
-		// Can never be too careful: double-check that ACF is active and the function exists
-		if ( ! function_exists( 'get_field_objects' ) ) {
-			return $meta_keys;
+		if ( isset( $this->keys[ $post_id ] ) ) {
+			return $this->keys[ $post_id ];
 		}
 
-		$acf_keys = get_field_objects( $post->ID, array( 'load_value' => false ) );
+		$post_id = acf_get_valid_post_id( $post_id );
+		$meta    = acf_get_meta( $post_id );
+
+		/**
+		 * Filter non ACF keys. {@see get_field_objects}.
+		 * We use this instead of `get_field_objects` to prevent circular reference and save memory.
+		 */
+		$this->keys[ $post_id ] = array_filter(
+			array_keys( $meta ),
+			static function ( string $key ) use ( $meta ) {
+				return isset( $meta[ '_' . $key ] );
+			}
+		);
+
+		return $this->keys[ $post_id ];
+	}
+
+	/**
+	 * @param array    $meta_keys Existing meta keys to parse for [gravityview] shortcode
+	 * @param \WP_Post $post Current post ID
+	 *
+	 * @return array
+	 */
+	public function add_meta_keys_from_post( $meta_keys = array(), $post = null ) {
+		$acf_keys = $this->get_acf_keys( (int) $post->ID );
 
 		if ( $acf_keys ) {
-			return array_merge( array_keys( $acf_keys ), $meta_keys );
+			return array_merge( $acf_keys, $meta_keys );
 		}
 
 		return $meta_keys;

readme.txt

@@ -21,23 +21,32 @@ Beautifully display your Gravity Forms entries. Learn more on [gravitykit.com](h
 
 == Changelog ==
 
+= 2.20.1 on February 29, 2024 =
+
+This release fixes an issue with View caching and improves compatibility with the Advanced Custom Fields plugin.
+
+#### 🐛 Fixed
+* Disappearing pagination and incorrect entry count when View caching is enabled.
+* Potential timeout issue when embedding GravityView shortcodes with Advanced Custom Fields plugin.
+* PHP 8.1+ deprecation notice.
+
 = 2.20 on February 22, 2024 =
 
 This release introduces new settings for better control over View caching, adds support for the Advanced Post Creation Add-On when editing entries, fixes a fatal error when exporting entries to CSV, and updates internal components for better performance and compatibility.
 
 #### 🚀 Added
-- Global and View-specific settings to control caching of View entries. [Learn more about GravityView caching](https://docs.gravitykit.com/article/58-about-gravityview-caching).
-- Support for the [Advanced Post Creation Add-On](https://www.gravityforms.com/add-ons/advanced-post-creation/) when editing entries in GravityView's Edit Entry mode.
+* Global and View-specific settings to control caching of View entries. [Learn more about GravityView caching](https://docs.gravitykit.com/article/58-about-gravityview-caching).
+* Support for the [Advanced Post Creation Add-On](https://www.gravityforms.com/add-ons/advanced-post-creation/) when editing entries in GravityView's Edit Entry mode.
 
 #### ✨ Improved
-- If Gravity Forms is not installed and/or activated, a notice is displayed to alert users when creating new or listing existing Views.
+* If Gravity Forms is not installed and/or activated, a notice is displayed to alert users when creating new or listing existing Views.
 
 #### 🐛 Fixed
-- Deprecation notice in PHP 8.1+ when displaying a View with file upload fields.
-- Fatal error when exporting entries to CSV.
+* Deprecation notice in PHP 8.1+ when displaying a View with file upload fields.
+* Fatal error when exporting entries to CSV.
 
 #### 🔧 Updated
-* [Foundation](https://www.gravitykit.com/foundation/) to versions 1.2.9.
+* [Foundation](https://www.gravitykit.com/foundation/) to version 1.2.9.
   - GravityKit products that are already installed can now be activated without a valid license.
   - Fixed PHP warning messages that appeared when deactivating the last active product with Foundation installed.
 

tests/unit-tests/GravityView_20_Issues.php

@@ -86,6 +86,7 @@ public function test_search_widget_embedded() {
 	 * @since 2.0.6.2
 	 */
 	function test_gv_age_shortcode() {
+		$this->markTestSkipped('Flaky test; temporarily disable');
 
 		add_shortcode( 'gv_age_1_x', array( $this, '_gv_age_1_x_shortcode' ) );
 		add_shortcode( 'gv_age_2_0', array( $this, '_gv_age_2_0_shortcode' ) );