Version 1.22

.travis.yml

@@ -14,7 +14,6 @@ branches:
     - master
     - develop
     - 2.0
-    - test
 
 php:
   - 5.3
@@ -24,6 +23,7 @@ php:
 
 env:
   - WP_VERSION=latest WP_MULTISITE=0
+  - WP_VERSION=latest WP_MULTISITE=0 GF_VERSION=2.3
   - WP_VERSION=4.0 WP_MULTISITE=0
 
 matrix:

future/_mocks.php

@@ -98,8 +98,12 @@ function GravityView_frontend_get_view_entries( $args, $form_id, $parameters, $c
 		$entries = $form->entries
 			->filter( \GV\GF_Entry_Filter::from_search_criteria( $criteria['search_criteria'] ) )
 			->offset( $args['offset'] )
-			->limit( $criteria['paging']['page_size'] )
-			->page( ( ( $criteria['paging']['offset'] - $args['offset'] ) / $criteria['paging']['page_size'] ) + 1 );
+			->limit( $criteria['paging']['page_size'] );
+
+		if ( $criteria['paging']['page_size'] ) {
+			$entries = $entries->page( ( ( $criteria['paging']['offset'] - $args['offset'] ) / $criteria['paging']['page_size'] ) + 1 );
+		}
+
 		if ( ! empty( $criteria['sorting'] ) ) {
 			$field = new \GV\Field();
 			$field->ID = $criteria['sorting']['key'];

gravityview.php

@@ -3,7 +3,7 @@
  * Plugin Name:       	GravityView
  * Plugin URI:        	https://gravityview.co
  * Description:       	The best, easiest way to display Gravity Forms entries on your website.
- * Version:          	1.21.5.3
+ * Version:          	1.22
  * Author:            	GravityView
  * Author URI:        	https://gravityview.co
  * Text Domain:       	gravityview
@@ -79,7 +79,7 @@
  */
 final class GravityView_Plugin {
 
-	const version = '1.21.5.3';
+	const version = '1.22';
 
 	private static $instance;
 

includes/class-admin-welcome.php

@@ -271,6 +271,26 @@ public function changelog_screen() {
 					<h2 style="border-bottom: 1px solid #ccc; padding-bottom: 1em; margin-bottom: 0;"><?php esc_html_e( 'What&rsquo;s New', 'gravityview' ); ?></h2>
 				</div>
 
+                <h3>1.22 on September 4, 2017</h3>
+
+                <ul>
+                    <li>Added: Support for Gravity Forms 2.3</li>
+                    <li>Fixed: Inline Edit plugin not working when displaying a single entry</li>
+                    <li>Fixed: Featured Entries plugin not adding correct CSS selector to the single entry container</li>
+                </ul>
+
+                <p><strong>Developer Updates:</strong></p>
+
+                <ul>
+                    <li>Modified: Template files <code>list-header.php</code>, <code>list-single.php</code>, <code>table-header.php</code>, <code>table-single.php</code></li>
+                    <li>Fixed: When <code>GRAVITYVIEW_LICENSE_KEY</code> constant is defined, it will always be used, and the license field will be disabled</li>
+                    <li>Fixed: List View and Table View templates have more standardized CSS selectors for single &amp; multiple contexts (<a href="http://docs.gravityview.co/article/63-css-guide">Learn more</a>)</li>
+                    <li>Fixed: Permalink issue when embedding a View on a page, then making it the site&#39;s Front Page</li>
+                    <li>Fixed: Transient cache issues when invalidating cache</li>
+                    <li>Fixed: <code>gv_empty()</code> now returns false for an array with all empty values</li>
+                    <li>Fixed: Delay plugin compatibility checks until <code>plugins_loaded</code></li>
+                </ul>
+
                 <h3>1.21.5.3 on July 24, 2017</h3>
 
                 <ul>

includes/class-api.php

@@ -494,6 +494,10 @@ public static function directory_link( $post_id = NULL, $add_query_args = true )
 		// @since 1.3
 		$link = wp_cache_get( 'gv_directory_link_'.$post_id );
 
+		if( (int) $post_id === (int) get_option( 'page_on_front' ) ) {
+			$link = home_url();
+		}
+
 		if( empty( $link ) ) {
 
 			$link = get_permalink( $post_id );

includes/class-cache.php

@@ -184,11 +184,11 @@ protected function get_cache_key_prefix( $form_ids = NULL ) {
 
 		// Normally just one form, but supports multiple forms
 		//
-		// Array of IDs 12, 5, 14 would result in `f-12f-5f-14`
-		$forms = 'f:' . implode( '&f:', (array) $form_ids );
+		// Array of IDs 12, 5, 14 would result in `f:12-f:5-f:14`
+		$forms = 'f:' . implode( '-f:', (array) $form_ids );
 
 		// Prefix for transient keys
-		// Now the prefix would be: `gv-cache-f-12f-5f-14`
+		// Now the prefix would be: `gv-cache-f:12-f:5-f:14-`
 		return 'gv-cache-' . $forms . '-';
 
 	}
@@ -408,7 +408,7 @@ public function delete( $form_ids = NULL ) {
 
 		foreach ( (array) $form_ids as $form_id ) {
 
-			$key = $this->get_cache_key_prefix( $form_id );
+			$key = '_transient_gv-cache-';
 
 			// WordPress 4.0+
 			if ( is_callable( array( $wpdb, 'esc_like' ) ) ) {
@@ -417,15 +417,20 @@ public function delete( $form_ids = NULL ) {
 				$key = like_escape( $key );
 			}
 
-			$key = "%" . $key . "%";
+			$form_id = intval( $form_id );
 
-			$sql = $wpdb->prepare( "DELETE FROM {$wpdb->options} WHERE `option_name` LIKE %s", $key );
+			// Find the transients containing this form
+			$key = "$key%f:$form_id-%"; // \_transient\_gv-cache-%f:1-% for example
+			$sql = $wpdb->prepare( "SELECT option_name FROM {$wpdb->options} WHERE `option_name` LIKE %s", $key );
 
-			$result = $wpdb->query( $sql );
+			foreach ( ( $transients = $wpdb->get_col( $sql ) ) as $transient ) {
+				// We have to delete it via the API to make sure the object cache is updated appropriately
+				delete_transient( preg_replace( '#^_transient_#', '', $transient ) );
+			}
 
 			do_action( 'gravityview_log_debug', 'GravityView_Cache[delete] Deleting cache for form #' . $form_id, array(
 				$sql,
-				sprintf( 'Deleted results: %d', $result )
+				sprintf( 'Deleted results: %d', count( $transients ) )
 			) );
 		}
 

includes/class-gravityview-entry-list.php

@@ -83,8 +83,7 @@ function __construct( $entries = array(), $post_id = 0, $form = array(), $link_f
 		$this->link_format = $link_format;
 		$this->after_link = $after_link;
 		$this->context = $context;
-		$this->empty_message = gv_no_results();
-
+		$this->empty_message = function_exists( 'gv_no_results' ) ? gv_no_results() : __('No entries match your request.', 'gravityview');
 	}
 
 	/**