Skip to content

Commit 766157e

Browse files
authored
Merge branch 'develop' into issue/2431-sequence-field
2 parents 6a7c4bf + 8820e47 commit 766157e

File tree

9 files changed

+426
-241
lines changed

9 files changed

+426
-241
lines changed

gravityview.php

Lines changed: 7 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
* Plugin Name: GravityView
44
* Plugin URI: https://www.gravitykit.com
55
* Description: The best, easiest way to display Gravity Forms entries on your website.
6-
* Version: 2.43.3
6+
* Version: 2.44
77
* Requires PHP: 7.4.0
88
* Author: GravityKit
99
* Author URI: https://www.gravitykit.com
@@ -32,7 +32,7 @@
3232
/**
3333
* The plugin version.
3434
*/
35-
define( 'GV_PLUGIN_VERSION', '2.43.3' );
35+
define( 'GV_PLUGIN_VERSION', '2.44' );
3636

3737
/**
3838
* Full path to the GravityView file
@@ -92,6 +92,11 @@
9292
add_action(
9393
'plugins_loaded',
9494
function () {
95+
96+
if ( class_exists( 'GravityView_Plugin', false ) ) {
97+
return;
98+
}
99+
95100
/**
96101
* GravityView_Plugin is only used by the legacy class-gravityview-extension.php that's shipped with extensions.
97102
*

includes/admin/class.render.settings.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@ class GravityView_Render_Settings {
1919
/**
2020
* A placeholder when no options are available.
2121
*
22-
* @since $ver$
22+
* @since 2.44
2323
*/
2424
public const NO_OPTIONS = '<!-- No Options -->';
2525

includes/class-admin-views.php

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1264,9 +1264,11 @@ function render_active_areas( $template_id, $type, $zone, $rows, $values ) {
12641264
<div class="gv-droppable-area-header-actions">
12651265
<?php
12661266
/**
1267-
* @action Modifies the area actions in the admin View editor.
1267+
* Allows adding custom actions inside the View editor's droppable areas.
12681268
*
1269-
* @since $ver$
1269+
* @action `gk/gravityview/admin-views/area/actions`
1270+
*
1271+
* @since 2.44
12701272
*
12711273
* @param array $area The current area configuration.
12721274
* @param string $type The type of area (e.g., 'widget', 'field').
@@ -2169,7 +2171,7 @@ private function is_dynamic( string $template_id, string $type, string $zone ):
21692171
/**
21702172
* Renders a "Clear all fields" button in the View configuration.
21712173
*
2172-
* @since $ver$
2174+
* @since 2.44
21732175
*
21742176
* @param array $area The area.
21752177
* @param string $type The type.

includes/class-api.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -881,6 +881,7 @@ function gv_get_query_args() {
881881
'view_id',
882882
'entry_id',
883883
'pagenum',
884+
'gv_updated',
884885
);
885886

886887
/**

0 commit comments

Comments
 (0)