| @@ -581,9 +581,9 @@ | ||
| 581 | 581 | * @param int|array|string If int, use the form id. |
| 582 | 582 | */ |
| 583 | 583 | public static function getRecordCount( $where = '' ) { |
| 584 | 584 | global $wpdb; |
| 585 | - $table_join = $wpdb->prefix . 'frm_items it LEFT OUTER JOIN ' . $wpdb->prefix . 'frm_forms fr ON it.form_id=fr.id'; | |
| 585 | + $table_join = $wpdb->prefix . 'frm_items it JOIN ' . $wpdb->prefix . 'frm_forms fr ON it.form_id=fr.id'; | |
| 586 | 586 | |
| 587 | 587 | if ( is_numeric( $where ) ) { |
| 588 | 588 | $table_join = 'frm_items'; |
| 589 | 589 | $where = array( 'form_id' => $where ); |
| @@ -754,9 +754,13 @@ | ||
| 754 | 754 | * |
| 755 | 755 | * @return int |
| 756 | 756 | */ |
| 757 | 757 | private static function get_is_draft_value( $values ) { |
| 758 | - return ( ( isset( $values['frm_saving_draft'] ) && $values['frm_saving_draft'] == 1 ) || ( isset( $values['is_draft'] ) && $values['is_draft'] == 1 ) ) ? 1 : 0; | |
| 758 | + if ( isset( $values['frm_saving_draft'] ) && FrmEntriesHelper::DRAFT_ENTRY_STATUS === (int) $values['frm_saving_draft'] ) { | |
| 759 | + return FrmEntriesHelper::DRAFT_ENTRY_STATUS; | |
| 760 | + } | |
| 761 | + | |
| 762 | + return isset( $values['is_draft'] ) ? absint( $values['is_draft'] ) : FrmEntriesHelper::SUBMITTED_ENTRY_STATUS; | |
| 759 | 763 | } |
| 760 | 764 | |
| 761 | 765 | /** |
| 762 | 766 | * Get the created_at value for a new entry |
