Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions classes/controllers/FrmAppController.php
Original file line number Diff line number Diff line change
Expand Up @@ -1331,7 +1331,7 @@ private static function in_our_pages() {
/**
* Handles actions related to the current screen.
*
* @since x.x
* @since 6.19
*
* @return void
*/
Expand Down Expand Up @@ -1421,7 +1421,7 @@ private static function remember_custom_sort() {
/**
* Retrieve and apply any saved sorting preferences for the current screen.
*
* @since x.x
* @since 6.19
*
* @param string &$orderby Reference to the current 'orderby' parameter.
* @param string &$order Reference to the current 'order' parameter.
Expand Down Expand Up @@ -1479,7 +1479,7 @@ private static function is_our_callback_array( $callback ) {
* This function tries to add them again when the user clicks the link to try again
* from the given inbox notice.
*
* @since x.x
* @since 6.19
*/
private static function add_missing_tables() {
FrmAppHelper::permission_check( 'frm_view_forms' );
Expand Down
8 changes: 4 additions & 4 deletions classes/helpers/FrmAppHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ class FrmAppHelper {
*
* @var string
*/
public static $plug_version = '6.18';
public static $plug_version = '6.19';

/**
* @var bool
Expand Down Expand Up @@ -334,7 +334,7 @@ public static function is_formidable_admin() {
/**
* Checks if is a list page.
*
* @since x.x
* @since 6.19
*
* @param string $page The name of the page to check.
* @return bool
Expand Down Expand Up @@ -4437,7 +4437,7 @@ public static function print_setting_error( $args ) {
/**
* Check if GDPR is enabled.
*
* @since x.x
* @since 6.19
*
* @return bool
*/
Expand All @@ -4449,7 +4449,7 @@ public static function is_gdpr_enabled() {
/**
* Check if GDPR cookies are disabled.
*
* @since x.x
* @since 6.19
*
* @return bool
*/
Expand Down
12 changes: 6 additions & 6 deletions classes/helpers/FrmFieldGdprHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* GDPR field helper
*
* @since x.x
* @since 6.19
* @package Formidable
*/

Expand All @@ -18,23 +18,23 @@ class FrmFieldGdprHelper {
/**
* Field type
*
* @since x.x
* @since 6.19
* @var string
*/
const FIELD_TYPE = 'gdpr';

/**
* Field class
*
* @since x.x
* @since 6.19
* @var string
*/
const FIELD_CLASS = 'FrmFieldGdpr';

/**
* Hide GDPR field
*
* @since x.x
* @since 6.19
* @return bool
*/
public static function hide_gdpr_field() {
Expand All @@ -45,7 +45,7 @@ public static function hide_gdpr_field() {
/**
* Add GDPR field to form builder
*
* @since x.x
* @since 6.19
* @param array $fields
* @return array
*/
Expand All @@ -60,7 +60,7 @@ public static function add_gdpr_field( $fields ) {
/**
* Initialize GDPR field Class name
*
* @since x.x
* @since 6.19
* @param string $field_type
* @return string
*/
Expand Down
2 changes: 1 addition & 1 deletion classes/helpers/FrmFormsListHelper.php
Original file line number Diff line number Diff line change
Expand Up @@ -377,7 +377,7 @@ protected function column_style( $form ) {
/**
* Generate the HTML for the form Views page.
*
* @since x.x
* @since 6.19
*
* @param stdClass $form Form object.
* @return string
Expand Down
2 changes: 1 addition & 1 deletion classes/models/FrmInbox.php
Original file line number Diff line number Diff line change
Expand Up @@ -520,7 +520,7 @@ public static function clear_cache() {
/**
* Check inbox for an "error" type. This is displayed on the form list page if one exists.
*
* @since x.x
* @since 6.19
*
* @return array|false
*/
Expand Down
2 changes: 1 addition & 1 deletion classes/models/FrmMigrate.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,7 +73,7 @@ public function upgrade() {
* If we fail to create the database tables, add an inbox notice.
* This informs the user that they need to correct the issue and try again.
*
* @since x.x
* @since 6.19
*
* @return void
*/
Expand Down
22 changes: 11 additions & 11 deletions classes/models/fields/FrmFieldGdpr.php
Original file line number Diff line number Diff line change
Expand Up @@ -4,32 +4,32 @@
}

/**
* @since x.x
* @since 6.19
*/
class FrmFieldGdpr extends FrmFieldType {

/**
* @since x.x
* @since 6.19
* @var string
*/
protected $type = 'gdpr';

/**
* @since x.x
* @since 6.19
* @var bool
*/
protected $has_for_label = false;

/**
* @since x.x
* @since 6.19
* @var string
*/
const VIEW_PATH = '/classes/views/frm-fields/front-end/gdpr/gdpr-field.php';

/**
* Get the new field defaults.
*
* @since x.x
* @since 6.19
* @return array
*/
public function get_new_field_defaults() {
Expand Down Expand Up @@ -57,7 +57,7 @@ public function get_new_field_defaults() {
/**
* Get the field settings for the field type.
*
* @since x.x
* @since 6.19
* @return bool[]
*/
protected function field_settings_for_type() {
Expand Down Expand Up @@ -90,7 +90,7 @@ protected function field_settings_for_type() {
/**
* Show the primary options for the field.
*
* @since x.x
* @since 6.19
* @param array $args The arguments.
*/
public function show_primary_options( $args ) {
Expand All @@ -111,7 +111,7 @@ public function show_label_on_form_builder() {
/**
* Gets extra field options.
*
* @since x.x
* @since 6.19
* @return string[]
*/
protected function extra_field_opts() {
Expand All @@ -123,7 +123,7 @@ protected function extra_field_opts() {
/**
* Include the form builder file.
*
* @since x.x
* @since 6.19
* @return string
*/
protected function include_form_builder_file() {
Expand All @@ -133,7 +133,7 @@ protected function include_form_builder_file() {
/**
* Include the front form file.
*
* @since x.x
* @since 6.19
* @return string
*/
protected function include_front_form_file() {
Expand All @@ -143,7 +143,7 @@ protected function include_front_form_file() {
/**
* Hide the field name/label if the GDPR field is disabled.
*
* @since x.x
* @since 6.19
*
* @param array $args The arguments.
* @param string $html The HTML.
Expand Down
2 changes: 1 addition & 1 deletion classes/views/frm-fields/back-end/gdpr/primary-options.php
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
* Primary options for gdpr field
*
* @package Formidable
* @since x.x
* @since 6.19
*
* @var array $field Field array.
* @var array $args Includes 'field', 'display', and 'values'.
Expand Down
2 changes: 1 addition & 1 deletion classes/views/frm-fields/back-end/settings.php
Original file line number Diff line number Diff line change
Expand Up @@ -232,7 +232,7 @@
/**
* Fires after displaying the field description in a form settings.
*
* @since x.x
* @since 6.19
*
* @param array $args {
* Array containing the field data.
Expand Down
2 changes: 1 addition & 1 deletion formidable.php
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@
/**
* Plugin Name: Formidable Forms
* Description: Quickly and easily create drag-and-drop forms
* Version: 6.18
* Version: 6.19
* Plugin URI: https://formidableforms.com/
* Author URI: https://formidableforms.com/
* Author: Strategy11 Form Builder Team
Expand Down
2 changes: 1 addition & 1 deletion js/formidable_admin.js
Original file line number Diff line number Diff line change
Expand Up @@ -2115,7 +2115,7 @@ function frmAdminBuildJS() {
/**
* Returns true if a field can be duplicated.
*
* @since x.x
* @since 6.19
*
* @param {HTMLElement} field
* @param {number} maxFieldsInGroup
Expand Down
Loading