Commit aabca4de authored by Kevin Stover's avatar Kevin Stover

Merge branch 'release/v2.7.3'

parents e4bc7d40 63d2b6ca
......@@ -355,7 +355,11 @@ class NF_Sub {
* @return void
*/
public function export( $return = false ){
Ninja_Forms()->subs()->export( array( $this->sub_id ), $return );
if ( $return ) {
return Ninja_Forms()->subs()->export( $this->sub_id, $return );
} else {
Ninja_Forms()->subs()->export( $this->sub_id, $return );
}
}
/**
......
......@@ -115,7 +115,7 @@ class NF_Subs_CPT {
$args = array(
'labels' => $labels,
'public' => true,
'public' => false,
'publicly_queryable' => true,
'show_ui' => true,
'_builtin' => false, // It's a custom post type, not built in!
......
......@@ -8,7 +8,7 @@ function ninja_forms_register_tab_form_settings(){
'page' => 'ninja-forms',
'display_function' => 'ninja_forms_display_form_settings',
'save_function' => 'ninja_forms_save_form_settings',
'tab_reload' => true,
'tab_reload' => false,
//'title' => '<h2>Forms <a href="'.$all_forms_link.'" class="add-new-h2">'.__('View All Forms', 'ninja-forms').'</a></h2>',
);
ninja_forms_register_tab('form_settings', $args);
......
......@@ -66,6 +66,8 @@ function ninja_forms_field_desc_display( $field_id, $data ){
$default_value = '';
}
$default_value = html_entity_decode( $default_value );
$default_value = wpautop( $default_value );
if( isset( $data['display_style'] ) ){
......
......@@ -363,7 +363,7 @@ function ninja_forms_field_list_display( $field_id, $data ){
$display_style = '';
}
$label = htmlspecialchars( $label, ENT_QUOTES );
//$label = htmlspecialchars( $label, ENT_QUOTES );
$label = stripslashes($label);
......@@ -409,7 +409,7 @@ function ninja_forms_field_list_display( $field_id, $data ){
$display_style = '';
}
$label = htmlspecialchars( $label, ENT_QUOTES );
//$label = htmlspecialchars( $label, ENT_QUOTES );
$label = stripslashes( $label) ;
......
......@@ -201,7 +201,7 @@ function ninja_forms_field_text_display( $field_id, $data ){
global $current_user;
$field_class = ninja_forms_get_field_class( $field_id );
if ( isset( $data['email'] ) ) {
if ( isset( $data['email'] ) && $data['email'] == 1 ) {
$field_class .= ' email';
}
......
......@@ -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.7.2
Version: 2.7.3
Author: The WP Ninjas
Author URI: http://ninjaforms.com
Text Domain: ninja-forms
......@@ -206,7 +206,7 @@ class Ninja_Forms {
// Plugin version
if ( ! defined( 'NF_PLUGIN_VERSION' ) ) {
define( 'NF_PLUGIN_VERSION', '2.7.2' );
define( 'NF_PLUGIN_VERSION', '2.7.3' );
}
// Plugin Folder Path
......
......@@ -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.7
Tested up to: 3.9.1
Stable tag: 2.7.2
Stable tag: 2.7.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,13 +76,17 @@ For help and video tutorials, please visit our website: [Ninja Forms Documentati
== Upgrade Notice ==
= 2.7.2 (25 July 2014) =
= 2.7.3 (29 July 2014) =
*Bugs:*
* Fixed an issue that could cause the submission values to appear as a widget on the submission edit screen.
* Fixed a bug that caused the text elements to be output with encoded html tags rather than the tags themselves.
* Fixed a bug that could cause a direct download if the "send CSV attachment" was checked.
* Fixed a bug that caused empty CSV files to be emailed to the admin.
*Changes:*
* List item labels can now contain HTML.
== Requested Features ==
......@@ -90,6 +94,18 @@ If you have any feature requests, please feel free to visit [ninjaforms.com](htt
== Changelog ==
= 2.7.3 (29 July 2014) =
*Bugs:*
* Fixed a bug that caused the text elements to be output with encoded html tags rather than the tags themselves.
* Fixed a bug that caused empty CSV files to be emailed to the admin.
*Changes:*
* List item labels can now contain HTML.
= 2.7.2 (25 July 2014) =
*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