Commit c7abc048 authored by Kevin Stover's avatar Kevin Stover

Merge branch 'githue/ninja-forms-issue/3704' into develop

parents 08be869f ee753ccd
Pipeline #654 passed with stage
in 55 seconds
File mode changed from 100755 to 100644
......@@ -89,7 +89,10 @@ class NF_Admin_CPT_DownloadAllSubmissions extends NF_Step_Processing {
}
$export .= NF_Database_Models_Submission::export( $this->args['form_id'], $sub_ids, TRUE );
if( 1 < $this->step ) {
$export = substr( $export, strpos( $export, PHP_EOL ) + 1 );
$stack = explode( apply_filters( 'nf_sub_csv_terminator', "\n" ), $export );
array_shift($stack);
$stack = implode( apply_filters( 'nf_sub_csv_terminator', "\n" ), $stack );
$export = $stack;
}
fwrite( $myfile, $export );
......
......@@ -36,7 +36,7 @@ final class NF_Dispatcher
* @since 3.2
* @return void
*
* @updated 3.3.17
* @updated UPDATE_VERSION_ON_MERGE
*/
public function update_environment_vars() {
global $wpdb;
......
......@@ -981,7 +981,7 @@ if( get_option( 'ninja_forms_load_deprecated', FALSE ) && ! ( isset( $_POST[ 'nf
* @return (Array) The filtered cron recurrences.
*
* @since
* @updated 3.3.17
* @updated UPDATE_VERSION_ON_MERGE
*/
function nf_custom_cron_job_recurrence( $schedules ) {
$schedules[ 'nf-monthly' ] = array(
......@@ -1007,7 +1007,7 @@ if( get_option( 'ninja_forms_load_deprecated', FALSE ) && ! ( isset( $_POST[ 'nf
/**
* Function called via weekly wp_cron to update our marketing feeds.
*
* @since 3.3.17
* @since UPDATE_VERSION_ON_MERGE
*/
function nf_update_marketing_feed() {
// Fetch our membership data.
......@@ -1032,7 +1032,7 @@ if( get_option( 'ninja_forms_load_deprecated', FALSE ) && ! ( isset( $_POST[ 'nf
/**
* Function called by our marketing feed cron.
*
* @since 3.3.17
* @since UPDATE_VERSION_ON_MERGE
*/
function nf_marketing_feed_cron_job() {
if ( ! wp_next_scheduled( 'nf_marketing_feed_cron' ) ) {
......
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