Commit ec9d0abb authored by Kyle Johnson's avatar Kyle Johnson

Merge branch 'develop'

parents 0dc7ebf7 7674fbf8
......@@ -4,7 +4,7 @@
Tags: form, forms, contact form, custom form, form builder, form creator, form manager, form creation, contact forms, custom forms, forms builder, forms creator, forms manager, forms creation, form administration,
Requires at least: 4.5
Tested up to: 4.7
Stable tag: 3.0.22
Stable tag: 3.0.23
License: GPLv2 or later
With a simple drag and drop interface you can create contact forms, email subscription forms, order forms, payment forms, and any other type of form for your WordPress site.
......
......@@ -111,7 +111,7 @@ class Ninja_Forms {
// Fire our Ninja Forms init action.
do_action( 'nf_admin_init', self::$instance );
}
/**
* Run some admin stuff on admin_notices hook.
*
......@@ -265,7 +265,7 @@ class Ninja_Forms {
// Plugin version
if ( ! defined( 'NF_PLUGIN_VERSION' ) )
define( 'NF_PLUGIN_VERSION', '3.0.22' );
define( 'NF_PLUGIN_VERSION', '3.0.23' );
// Plugin Folder Path
if ( ! defined( 'NF_PLUGIN_DIR' ) )
......
......@@ -236,6 +236,21 @@ class NF_Abstracts_Model
$key = $result[ 'key' ];
$this->_settings[ $key ] = $result[ 'value' ];
}
$field = $wpdb->get_row(
"
SELECT `label`, `key`, `type`
FROM $this->_table_name
WHERE `id` = '$this->_id'
",
ARRAY_A
);
if( ! is_wp_error( $field ) ){
$this->_settings[ 'label' ] = $field[ 'label' ];
$this->_settings[ 'key' ] = $field[ 'key' ];
$this->_settings[ 'type' ] = $field[ 'type' ];
}
}
if( ! $this->_settings ) {
......@@ -508,7 +523,7 @@ class NF_Abstracts_Model
/**
* Cache Flag
*
*
* @param string $cache
* @return $this
*/
......
......@@ -3,7 +3,7 @@
Plugin Name: Ninja Forms
Plugin URI: http://ninjaforms.com/
Description: Ninja Forms is a webform builder with unparalleled ease of use and features.
Version: 3.0.22
Version: 3.0.23
Author: The WP Ninjas
Author URI: http://ninjaforms.com
Text Domain: ninja-forms
......@@ -51,7 +51,7 @@ if( get_option( 'ninja_forms_load_deprecated', FALSE ) && ! ( isset( $_POST[ 'nf
/**
* @since 3.0
*/
const VERSION = '3.0.22';
const VERSION = '3.0.23';
/**
* @var Ninja_Forms
......@@ -714,7 +714,7 @@ if( get_option( 'ninja_forms_load_deprecated', FALSE ) && ! ( isset( $_POST[ 'nf
/*
* If we haven't already submitted our email to api.ninjaforms.com, submit it and set an option saying we have.
*/
if ( get_option ( 'ninja_forms_optin_admin_email', false ) ) {
return false;
}
......@@ -722,7 +722,7 @@ if( get_option( 'ninja_forms_load_deprecated', FALSE ) && ! ( isset( $_POST[ 'nf
/*
* Ping api.ninjaforms.com
*/
$admin_email = get_option('admin_email');
$url = home_url();
$response = wp_remote_post(
......@@ -761,4 +761,4 @@ if( get_option( 'ninja_forms_load_deprecated', FALSE ) && ! ( isset( $_POST[ 'nf
}
add_action( 'wp', 'nf_optin_send_admin_email_cron_job' );
}
\ No newline at end of file
}
......@@ -3,7 +3,7 @@ Contributors: wpninjasllc, kstover, jameslaws, kbjohnson90, klhall1987, wpnzach,
Tags: form, forms, contact form, custom form, form builder, form creator, form manager, form creation, contact forms, custom forms, forms builder, forms creator, forms manager, forms creation, form administration,
Requires at least: 4.5
Tested up to: 4.7
Stable tag: 3.0.22
Stable tag: 3.0.23
License: GPLv2 or later
Drag and drop fields in an intuitive UI to create create contact forms, email subscription forms, order forms, payment forms, send emails and more!
......@@ -102,24 +102,20 @@ For help and video tutorials, please visit our website: [Ninja Forms Documentati
== Upgrade Notice ==
= 3.0.22 (11 January 2017) =
*Changes:*
* Added an import for list options.
* Refactored form submissions so that they are more responsive for longer forms with more submissions.
* Moved the 'reply_to' setting to the primary section in email actions.
* Added error handling for invalid "TO" email addresses.
= 3.0.23 (12 January 2017) =
*Bugs:*
* Fixed a bug that caused installations to crash on older, unsecure versions of PHP.
* Fixed a bug with calculations that caused brackets to appear in calculation fields.
* On/off settings should now save properly in all situations.
* Dragging a field should now properly scroll the screen.
* Fixed a bug with form duplication.
== Changelog ==
= 3.0.23 (12 January 2017) =
*Bugs:*
* Fixed a bug with form duplication.
= 3.0.22 (11 January 2017) =
*Bugs:*
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment