Skip to content

Commit

Permalink
Complete version 2.0.03
Browse files Browse the repository at this point in the history
  • Loading branch information
stephywells committed Apr 17, 2015
1 parent 24533bb commit e2bba02
Show file tree
Hide file tree
Showing 2 changed files with 15 additions and 1 deletion.
2 changes: 1 addition & 1 deletion classes/controllers/FrmFormActionsController.php
Original file line number Diff line number Diff line change
Expand Up @@ -253,7 +253,7 @@ public static function trigger_actions( $event, $form, $entry, $type = 'all', $a
$entry = FrmEntry::getOne( $entry, true );
}

$child_entry = ( ( $form && is_numeric( $form->parent_form_id ) && $form->parent_form_id ) || ( $entry && ( $entry->form_id != $form->id || $entry->parent_item_id ) || ( isset( $args['is_child'] ) && $args['is_child'] ) );
$child_entry = ( ( $form && is_numeric( $form->parent_form_id ) && $form->parent_form_id ) || ( $entry && ( $entry->form_id != $form->id || $entry->parent_item_id ) ) || ( isset( $args['is_child'] ) && $args['is_child'] ) );

if ( $child_entry ) {
//don't trigger actions for sub forms
Expand Down
14 changes: 14 additions & 0 deletions readme.txt
Original file line number Diff line number Diff line change
Expand Up @@ -89,6 +89,20 @@ A. Try clearing your browser cache. As plugin modifications are made, frequent j
[See more FAQs](http://formidablepro.com/formidable-faqs/ "Formidable Form FAQs")

== Changelog ==
= 2.0.03 =
* Use frm_clear instead of clear to minimize conflicts
* Add js fallback for database update on sites without CURL
* Fix issues with emails migrating to actions in php 5.3, and t showing in some emails after updating settings
* Pro: Add frm_date_format filter
* Pro: If a comma separated list of dates is sent for formatting, explode it before formatting
* Pro: Increase the backtrack limit when needed when replacing shortcodes in the view content if server has the limit below default
* Pro: Fix issue causing csv export error
* Pro: Fix the issue cuasing new posts to not be linked to a view if a field is selected for the post content
* Pro: Fix issue some users are having with blank date fields
* Pro: Fix ending collapsible sections at the end of a section instead of waiting for the next section
* Pro: Fix firing calculations on page load when there are multiple calculations
* Pro: Don't allow theme to affect the font size of stars

= 2.0.02 =
* Make sure frm_to_email hook is reverse compatible
* Fix php example in the shortcode examples
Expand Down

0 comments on commit e2bba02

Please sign in to comment.