Commit b77f5d2a authored by Kevin Stover's avatar Kevin Stover

Merge branch 'release/v2.5.3'

parents 115a67ce 35bb71f9
......@@ -129,7 +129,9 @@ jQuery(document).ready(function(jQuery) {
if(ajax == 1){
var options = {
beforeSerialize: function($form, add_product_form_options) {
tinyMCE.triggerSave();
if ( typeof tinyMCE !== 'undefined' ) {
tinyMCE.triggerSave();
}
},
beforeSubmit: ninja_forms_before_submit,
success: ninja_forms_response,
......
This diff is collapsed.
......@@ -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: 2.5.2
Version: 2.5.3
Author: The WP Ninjas
Author URI: http://ninjaforms.com
Text Domain: ninja-forms
......@@ -54,7 +54,7 @@ global $wpdb, $wp_version;
define("NINJA_FORMS_DIR", WP_PLUGIN_DIR."/".basename( dirname( __FILE__ ) ) );
define("NINJA_FORMS_URL", plugins_url()."/".basename( dirname( __FILE__ ) ) );
define("NINJA_FORMS_VERSION", "2.5.2");
define("NINJA_FORMS_VERSION", "2.5.3");
define("NINJA_FORMS_TABLE_NAME", $wpdb->prefix . "ninja_forms");
define("NINJA_FORMS_FIELDS_TABLE_NAME", $wpdb->prefix . "ninja_forms_fields");
define("NINJA_FORMS_FAV_FIELDS_TABLE_NAME", $wpdb->prefix . "ninja_forms_fav_fields");
......@@ -287,13 +287,6 @@ require_once( NINJA_FORMS_DIR . "/includes/fields/post-excerpt.php" );
*/
require_once( NINJA_FORMS_DIR . "/includes/admin/save.php" );
if(session_id() == '') {
session_start();
}
$_SESSION['NINJA_FORMS_DIR'] = NINJA_FORMS_DIR;
$_SESSION['NINJA_FORMS_URL'] = NINJA_FORMS_URL;
// Set $_SESSION variable used for storing items in transient variables
function ninja_forms_set_transient_id(){
if ( !isset ( $_SESSION['ninja_forms_transient_id'] ) AND !is_admin() ) {
......
......@@ -3,7 +3,7 @@ Contributors: kstover, jameslaws, daveshine, mordauk, bftrick, helgatheviking
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: 3.6
Tested up to: 3.8.1
Stable tag: 2.5.2
Stable tag: 2.5.3
License: GPLv2 or later
Forms created with a simple drag and drop interface. Contact forms, Email collection forms, or any other form you want on your WordPress site.
......@@ -76,15 +76,11 @@ For help and video tutorials, please visit our website: [Ninja Forms Documentati
== Upgrade Notice ==
= 2.5.2 =
= 2.5.3 =
*Bugs:*
* Fixed various bugs with the default label position. It should now always default to above.
* Fixed a bug that could cause Admin emails to appear to have attachments when they didn't.
* Required fields can now have a value of 0.
* Fixed a bug with list fields and calculations that could cause them not to pre-populate properly.
* Fixed a bug that could cause incomplete submissions to show in the dashboard for those using the Save Progress extension or the Multi-Part Forms extension.
* Fixed a bug that could prevent AJAX submissions from working properly.
== Requested Features ==
......@@ -92,6 +88,12 @@ If you have any feature requests, please feel free to visit [ninjaforms.com](htt
== Changelog ==
= 2.5.3 =
*Bugs:*
* Fixed a bug that could prevent AJAX submissions from working properly.
= 2.5.2 =
*Bugs:*
......@@ -100,7 +102,7 @@ If you have any feature requests, please feel free to visit [ninjaforms.com](htt
* Fixed a bug that could cause Admin emails to appear to have attachments when they didn't.
* Required fields can now have a value of 0.
* Fixed a bug with list fields and calculations that could cause them not to pre-populate properly.
* Fixed a bug that could cause incomplete submissions to show in the dashboard for those using the Save Progress extension or the Multi-Part Forms extension.
* Fixed a bug that could cause incomplete submissions to show in the dashboard for those using the Save Progress extension or the Multi-Part Forms extension.
= 2.5.1 =
......
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