Commit d7ac8625 authored by Kevin Stover's avatar Kevin Stover

Merge branch 'release/v2.7.1'

parents 1310a97b af8df10f
......@@ -267,7 +267,7 @@ class NF_Subs_CPT {
// Compatibility with old field registration system. Can be removed when the new one is in place.
if ( isset ( $_GET['form_id'] ) && $_GET['form_id'] != '' ) {
$form_id = $_GET['form_id'];
if ( is_array ( Ninja_Forms()->form( $this->form_id )->fields ) ) {
if ( is_object( Ninja_Forms()->form( $form_id ) ) && is_array ( Ninja_Forms()->form( $this->form_id )->fields ) ) {
foreach ( Ninja_Forms()->form( $this->form_id )->fields as $field ) {
$field_id = $field['id'];
$field_type = $field['type'];
......@@ -996,7 +996,8 @@ class NF_Subs_CPT {
</div>
<div id="major-publishing-actions">
<div id="delete-action">
<a class="submitdelete deletion" href="http://localhost/wp-dev/wp-admin/post.php?post=296&amp;action=trash&amp;_wpnonce=604c2e6a4c">Move to Trash</a></div>
<!-- <a class="submitdelete deletion" href="<?php echo get_delete_post_link( $post->ID ); ?>">Move to Trash</a></div> -->
<div id="publishing-action">
<span class="spinner"></span>
......
......@@ -104,7 +104,7 @@ function nf_v27_upgrade_subs_to_cpt() {
$old_sub_count = $convert_subs->count_old_subs();
if( empty( $total ) || $total <= 1 ) {
$total = round( ( $old_sub_count / 100 ), 0, PHP_ROUND_HALF_UP ) + 1;
$total = round( ( $old_sub_count / 100 ), 0 ) + 2;
}
if ( $step <= $total ) {
......
......@@ -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
Version: 2.7.1
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' );
define( 'NF_PLUGIN_VERSION', '2.7.1' );
}
// 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
Stable tag: 2.7.1
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,6 +76,24 @@ For help and video tutorials, please visit our website: [Ninja Forms Documentati
== Upgrade Notice ==
= 2.7.1 (25 July 2014) =
*Bugs:*
* Fixed an issue with older versions of PHP and the round() function.
== Requested Features ==
If you have any feature requests, please feel free to visit [ninjaforms.com](http://ninjaforms.com) and let us know about it.
== Changelog ==
= 2.7.1 (25 July 2014) =
*Bugs:*
* Fixed an issue with older versions of PHP and the round() function.
= 2.7 (24 July 2014) =
*Changes:*
......@@ -89,12 +107,6 @@ For help and video tutorials, please visit our website: [Ninja Forms Documentati
* Fixed several bugs.
== Requested Features ==
If you have any feature requests, please feel free to visit [ninjaforms.com](http://ninjaforms.com) and let us know about it.
== Changelog ==
= 2.6.5 (06/10/2014) =
*Changes:*
......
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