Updates to 2.9.12

Author: Gravity Forms

change_log.txt

@@ -1,5 +1,13 @@
+### 2.9.12 | 2025-07-10
+- Added merge tags on the "Send To: Enter Email" notification setting. Credit: The GravityKit Team.
+- Updated the legacy Akismet spam check during form submission to run via the [`gform_entry_is_spam`](https://docs.gravityforms.com/gform_entry_is_spam/) filter in preparation for version 1.1.0 of the Akismet add-on.
+- Fixed rendering of calculated product in form editor when quantity is disabled.
+- Fixed an issue where the recent forms list used by the form switcher is not updated when the admin toolbar menu is disabled.
+- Fixed an issue in reCAPTCHA that prevents the form from being submitted when the reCAPTCHA API keys are invalid on the settings page.
+- Removed the mock-data endpoint from production environments.
+
 ### 2.9.11 | 2025-06-26
-- Added a h1 to all admin pages to improve accessibility.
+- Added a top-level heading to all admin pages to improve accessibility.
 - Fixed undefined variable error when the filter [gform_toolbar_menu](https://docs.gravityforms.com/gform_toolbar_menu/) returns an empty array.
 - Fixed handling of notification addressing where comma-separation of merge tags includes spaces.
 - Updated links in the admin to indicate when they open in a new window for improved accessibility.

common.php

@@ -4577,30 +4577,25 @@ public static function is_spam_entry( $entry, $form ) {
 		self::timer_start( __METHOD__ );
 		$is_spam = false;
 
-		if ( self::akismet_enabled( $form_id ) ) {
-			$is_spam = self::is_akismet_spam( $form, $entry );
-			self::log_debug( __METHOD__ . '(): Result from Akismet: ' . json_encode( $is_spam ) );
-			if ( $is_spam ) {
-				self::set_spam_filter( $form_id, __( 'Akismet Spam Filter', 'gravityforms' ), '' );
-			}
+		$akismet_callback = array( __CLASS__, 'entry_is_spam_akismet' );
+		if ( has_filter( 'gform_entry_is_spam', $akismet_callback ) === false ) {
+			add_filter( 'gform_entry_is_spam', $akismet_callback, 90, 3 );
 		}
 
-		$gform_entry_is_spam_args = array( 'gform_entry_is_spam', $form_id );
-		if ( gf_has_filter( $gform_entry_is_spam_args ) ) {
-			GFCommon::log_debug( __METHOD__ . '(): Executing functions hooked to gform_entry_is_spam.' );
-			/**
-			 * Allows submissions to be flagged as spam by custom methods.
-			 *
-			 * @since 1.8.17
-			 * @since 2.4.17 Moved from GFFormDisplay::handle_submission().
-			 *
-			 * @param bool  $is_spam Indicates if the submission has been flagged as spam.
-			 * @param array $form    The form currently being processed.
-			 * @param array $entry   The entry currently being processed.
-			 */
-			$is_spam = gf_apply_filters( $gform_entry_is_spam_args, $is_spam, $form, $entry );
-			self::log_debug( __METHOD__ . '(): Result from gform_entry_is_spam filter: ' . json_encode( $is_spam ) );
-		}
+		GFCommon::log_debug( __METHOD__ . '(): Executing functions hooked to gform_entry_is_spam.' );
+
+		/**
+		 * Allows submissions to be flagged as spam by custom methods.
+		 *
+		 * @since 1.8.17
+		 * @since 2.4.17 Moved from GFFormDisplay::handle_submission().
+		 *
+		 * @param bool  $is_spam Indicates if the submission has been flagged as spam.
+		 * @param array $form    The form currently being processed.
+		 * @param array $entry   The entry currently being processed.
+		 */
+		$is_spam = gf_apply_filters( array( 'gform_entry_is_spam', $form_id ), $is_spam, $form, $entry );
+		self::log_debug( __METHOD__ . '(): Result from gform_entry_is_spam filter: ' . json_encode( $is_spam ) );
 
 		if ( $use_cache ) {
 			GFFormDisplay::$submission[ $form_id ]['is_spam'] = $is_spam;
@@ -4643,7 +4638,49 @@ public static function spam_enabled( $form_id ) {
 		return $spam_enabled;
 	}
 
+	/**
+	 * Callback for gform_entry_is_spam; performs the Akimset spam check.
+	 *
+	 * @since 2.9.12 Moved to a filter callback from GFCommon::is_spam_entry().
+	 *
+	 * @param bool  $is_spam Indicates if the submission has been flagged as spam.
+	 * @param array $form    The form currently being processed.
+	 * @param array $entry   The entry currently being processed.
+	 *
+	 * @return bool
+	 */
+	public static function entry_is_spam_akismet( $is_spam, $form, $entry ) {
+		if ( $is_spam ) {
+			return $is_spam;
+		}
+
+		$form_id = (int) rgar( $form, 'id' );
+		if ( ! self::akismet_enabled( $form_id ) ) {
+			return $is_spam;
+		}
+
+		$is_spam = self::is_akismet_spam( $form, $entry );
+		self::log_debug( __METHOD__ . '(): Result from Akismet: ' . json_encode( $is_spam ) );
+		if ( $is_spam ) {
+			self::set_spam_filter( $form_id, __( 'Akismet Spam Filter', 'gravityforms' ), '' );
+		}
+
+		return $is_spam;
+	}
+
+	/**
+	 * Determines if the Akismet integration is available.
+	 *
+	 * @since unknown
+	 * @since 2.9.12 Disable the integration when the Akismet Add-On (that communicates directly with the Akismet API) is active.
+	 *
+	 * @return bool
+	 */
 	public static function has_akismet() {
+		if ( function_exists( 'gf_akismet' ) && method_exists( gf_akismet(), 'initalize_api' ) ) {
+			return false;
+		}
+
 		$akismet_exists = function_exists( 'akismet_http_post' ) || method_exists( 'Akismet', 'http_post' );
 
 		return $akismet_exists;

forms_model.php

@@ -8197,15 +8197,12 @@ public static function is_valid_operator( $operator ) {
 	 * Update the recent forms list for the current user when a form is edited or trashed.
 	 *
 	 * @since 2.0.7.14
+	 * @since 2.9.12 Removed the dependency on the admin toolbar being enabled.
 	 *
 	 * @param int $form_id The ID of the current form.
 	 * @param bool $trashed Indicates if the form was trashed. Default is false, form was opened for editing.
 	 */
 	public static function update_recent_forms( $form_id, $trashed = false ) {
-		if ( ! get_option( 'gform_enable_toolbar_menu' ) ) {
-			return;
-		}
-
 		$current_user_id = get_current_user_id();
 		$recent_form_ids = self::get_recent_forms( $current_user_id );
 

gravityforms.php

@@ -3,7 +3,7 @@
 Plugin Name: Gravity Forms
 Plugin URI: https://gravityforms.com
 Description: Easily create web forms and manage form entries within the WordPress admin.
-Version: 2.9.11
+Version: 2.9.12
 Requires at least: 6.5
 Requires PHP: 7.4
 Author: Gravity Forms
@@ -257,7 +257,7 @@ class GFForms {
 	 *
 	 * @var string $version The version number.
 	 */
-	public static $version = '2.9.11';
+	public static $version = '2.9.12';
 
 	/**
 	 * Handles background upgrade tasks.

includes/config/class-gf-config-service-provider.php

@@ -146,13 +146,16 @@ public function init( GF_Service_Container $container ) {
 		});
 
 		add_action( 'rest_api_init', function () use ( $container, $self ) {
-			register_rest_route( 'gravityforms/v2', '/tests/mock-data', array(
-				'methods'             => 'GET',
-				'callback'            => array( $self, 'config_mocks_endpoint' ),
-				'permission_callback' => function () {
-					return true;
-				},
-			) );
+			// check if we are in a test environment, if so register the mock data endpoint.
+			if ( defined( 'GF_SCRIPT_DEBUG' ) && GF_SCRIPT_DEBUG ) {
+				register_rest_route( 'gravityforms/v2', '/tests/mock-data', array(
+					'methods'             => 'GET',
+					'callback'            => array( $self, 'config_mocks_endpoint' ),
+					'permission_callback' => function () {
+						return true;
+					},
+				) );
+			}
 		} );
 
 		// Add global config data to admin and theme.

includes/fields/class-gf-field-calculation.php

@@ -79,7 +79,7 @@ public function get_field_input( $form, $value = '', $entry = null ) {
 
 		if ( $is_entry_detail || $is_form_editor  ) {
 			$style          = $this->disableQuantity ? "style='display:none;'" : '';
-			$quantity_field = " <label for='ginput_quantity_{$form_id}_{$this->id}' class='ginput_quantity_label gform-field-label' {$style}>{$product_quantity_sub_label}</label> <input type='number' name='input_{$id}.3' value='{$quantity}' id='ginput_quantity_{$form_id}_{$this->id}' class='ginput_quantity' size='10' min='0' {$disabled_text} />";
+			$quantity_field = " <label for='ginput_quantity_{$form_id}_{$this->id}' class='ginput_quantity_label gform-field-label' {$style}>{$product_quantity_sub_label}</label> <input type='number' name='input_{$id}.3' value='{$quantity}' id='ginput_quantity_{$form_id}_{$this->id}' class='ginput_quantity' size='10' min='0' {$disabled_text} {$style} />";
 		} elseif ( ! $this->disableQuantity ) {
 			$tabindex                  = $this->get_tabindex();
 			$describedby_extra_id = array();

js/gravityforms.js

@@ -2395,9 +2395,13 @@ gform.recaptcha = {
 		jQuery( '.ginput_recaptcha:not(.gform-initialized)' ).each( function() {
 			let $elem      = jQuery( this ),
 				parameters = {
-					'sitekey':  $elem.data( 'sitekey' ),
-					'theme':    $elem.data( 'theme' ),
-					'tabindex': $elem.data( 'tabindex' )
+					'sitekey':        $elem.data( 'sitekey' ),
+					'theme':          $elem.data( 'theme' ),
+					'tabindex':       $elem.data( 'tabindex' ),
+					'error-callback': () => {
+						console.error( 'Gravity Forms: There was an error initializing reCAPTCHA v2. Please ensure your reCAPTCHA API keys are valid.' );
+						$elem.attr( 'data-recaptcha-error', '1' );
+					}
 				};
 
 			if ( $elem.data( 'stoken' ) ) {
@@ -2494,6 +2498,12 @@ gform.recaptcha = {
 	 */
 	executeRecaptcha: async function( widgetId, form ) {
 
+		// If there was an error loading recaptcha, just abort and let the submission fail validation.
+		const recaptcha = gform.utils.getNode( '.ginput_recaptcha', form, true );
+		if ( recaptcha.getAttribute( 'data-recaptcha-error' ) === '1' ) {
+			return;
+		}
+
 		// Executes recaptcha.
 		window.grecaptcha.execute( widgetId );