From 95ca0f89827e891e1e84f1ea553cc30d1a01b25d Mon Sep 17 00:00:00 2001 From: Nathan Coad Date: Sun, 8 Mar 2015 21:09:43 +1100 Subject: [PATCH] bugfixes --- booking.admin.inc | 4 ++-- booking.reports.inc | 3 ++- 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/booking.admin.inc b/booking.admin.inc index 186bc5a..fb39df8 100644 --- a/booking.admin.inc +++ b/booking.admin.inc @@ -104,14 +104,14 @@ function booking_admin() { ); $form['paypal']['booking_paypal_account'] = array ( '#type' => 'textfield', - '#title' => t('Account'), + '#title' => t('Specify Paypal Account Address'), '#default_value' => variable_get('booking_paypal_account', ''), '#description' => '(email address)', ); $form['paypal']['booking_paypal_sandbox'] = array ( '#type' => 'radios', '#title' => t('Sandbox/Development mode'), - '#description' => t('When in development mode, the payment gateway will point at sandbox.paypal.com for testing purposes.'), + '#description' => t('When in development mode, the payment gateway will point at sandbox.paypal.com for testing purposes. Leave this as off unless doing testing.'), '#options' => array (0 => t('Off'), t('On')), '#default_value' => variable_get('booking_paypal_sandbox', 0), ); diff --git a/booking.reports.inc b/booking.reports.inc index fa83937..ed2a672 100644 --- a/booking.reports.inc +++ b/booking.reports.inc @@ -743,7 +743,8 @@ function booking_csv_report() { continue; } - // Enclose fields containing $delimiter, $enclosure or wh if ( $encloseAll || preg_match( "/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $value ) ) { + // Enclose fields containing $delimiter, $enclosure or whitespace + if ( $encloseAll || preg_match( "/(?:${delimiter_esc}|${enclosure_esc}|\s)/", $value ) ) { $output[] = $enclosure . str_replace($enclosure, $enclosure . $enclosure, $value) . $enclosure; } else {