Completed
Branch master (87a62b)
by
unknown
18:29 queued 13:45
created
libraries/messages/defaults/default/html_receipt_attendee_list.template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -8,11 +8,11 @@
 block discarded – undo
8 8
 <li class="ticket-registration">
9 9
     <table class="registration-details">
10 10
         <tr class="odd">
11
-            <th><?php	_e('Attendee', 'event_espresso');?></th>
11
+            <th><?php	_e('Attendee', 'event_espresso'); ?></th>
12 12
             <td>[FNAME] [LNAME] ([ATTENDEE_EMAIL])</td>
13 13
         </tr>
14 14
         <tr>
15
-            <th><?php esc_html_e("Registration Code:", "event_espresso");?></th>
15
+            <th><?php esc_html_e("Registration Code:", "event_espresso"); ?></th>
16 16
             <td>[REGISTRATION_CODE] - <span class="[REGISTRATION_STATUS_ID]">[REGISTRATION_STATUS_LABEL]</span></td>
17 17
         </tr>
18 18
     </table>
Please login to merge, or discard this patch.
reg_steps/payment_options/no_payment_required.template.php 1 patch
Indentation   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -3,36 +3,36 @@
 block discarded – undo
3 3
 /** @type array $registrations_for_free_events */
4 4
 
5 5
 if (is_array($registrations_for_free_events) && ! empty($registrations_for_free_events)) {
6
-    echo apply_filters(
7
-        'FHEE__registration_page_payment_options__no_payment_required_hdr',
8
-        sprintf(
9
-            esc_html__('%1$sNo Payment Required%2$s', 'event_espresso'),
10
-            '<h6>',
11
-            '</h6>'
12
-        )
13
-    );
14
-    foreach ($registrations_for_free_events as $registration_for_free_event) {
15
-        if (
16
-            $registration_for_free_event instanceof EE_Registration
17
-            && $registration_for_free_event->ticket()->is_free()
18
-        ) {
19
-            if ($registration_for_free_event->event() instanceof EE_Event) {
20
-                ?>
6
+	echo apply_filters(
7
+		'FHEE__registration_page_payment_options__no_payment_required_hdr',
8
+		sprintf(
9
+			esc_html__('%1$sNo Payment Required%2$s', 'event_espresso'),
10
+			'<h6>',
11
+			'</h6>'
12
+		)
13
+	);
14
+	foreach ($registrations_for_free_events as $registration_for_free_event) {
15
+		if (
16
+			$registration_for_free_event instanceof EE_Registration
17
+			&& $registration_for_free_event->ticket()->is_free()
18
+		) {
19
+			if ($registration_for_free_event->event() instanceof EE_Event) {
20
+				?>
21 21
                 <p>
22 22
                     <?php echo apply_filters(
23
-                        'FHEE__registration_page_payment_options__no_payment_required_pg',
24
-                        sprintf(
25
-                            esc_html__(
26
-                                '"%1$s" for "%2$s" is free, so no payment is required and no billing will occur.',
27
-                                'event_espresso'
28
-                            ),
29
-                            $registration_for_free_event->ticket()->name(),
30
-                            $registration_for_free_event->event()->name()
31
-                        )
32
-                    ); ?>
23
+						'FHEE__registration_page_payment_options__no_payment_required_pg',
24
+						sprintf(
25
+							esc_html__(
26
+								'"%1$s" for "%2$s" is free, so no payment is required and no billing will occur.',
27
+								'event_espresso'
28
+							),
29
+							$registration_for_free_event->ticket()->name(),
30
+							$registration_for_free_event->event()->name()
31
+						)
32
+					); ?>
33 33
                 </p>
34 34
                 <?php
35
-            }
36
-        }
37
-    }
35
+			}
36
+		}
37
+	}
38 38
 }
Please login to merge, or discard this patch.
modules/ticket_selector/templates/standard_ticket_selector.template.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -91,7 +91,7 @@  discard block
 block discarded – undo
91 91
         $ticket_price_includes_taxes = esc_html__('* price does not include taxes', 'event_espresso');
92 92
     }
93 93
     echo '<p class="small-text lt-grey-text" style="text-align:right; margin: -1em 0 1em;">
94
-        ' . $ticket_price_includes_taxes . '
94
+        ' . $ticket_price_includes_taxes.'
95 95
         </p>';
96 96
 }
97 97
 ?>
@@ -105,7 +105,7 @@  discard block
 block discarded – undo
105 105
         esc_html('')
106 106
     );
107 107
 }
108
-if (! apply_filters('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', false)) {
108
+if ( ! apply_filters('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', false)) {
109 109
     add_filter('FHEE__EE_Ticket_Selector__no_ticket_selector_submit', '__return_true');
110 110
 }
111 111
 do_action('AHEE__ticket_selector_chart__template__after_ticket_selector', $EVT_ID, $event);
Please login to merge, or discard this patch.
Indentation   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -29,12 +29,12 @@  discard block
 block discarded – undo
29 29
         <tr>
30 30
             <th id="details-<?php echo esc_attr($EVT_ID); ?>" scope="col" class="ee-ticket-selector-ticket-details-th">
31 31
                 <?php
32
-                echo apply_filters(
33
-                    'FHEE__ticket_selector_chart_template__table_header_available_tickets',
34
-                    esc_html__('Details', 'event_espresso'),
35
-                    $EVT_ID
36
-                );
37
-                ?>
32
+				echo apply_filters(
33
+					'FHEE__ticket_selector_chart_template__table_header_available_tickets',
34
+					esc_html__('Details', 'event_espresso'),
35
+					$EVT_ID
36
+				);
37
+				?>
38 38
             </th>
39 39
             <?php if (apply_filters('FHEE__ticket_selector_chart_template__display_ticket_price_details', true)) { ?>
40 40
                 <th id="price-<?php echo esc_attr($EVT_ID); ?>" scope="col" class="ee-ticket-selector-ticket-price-th
@@ -53,12 +53,12 @@  discard block
 block discarded – undo
53 53
     </table>
54 54
 <?php
55 55
 if ($taxable_tickets && apply_filters('FHEE__ticket_selector_chart_template__display_ticket_price_details', true)) {
56
-    if ($prices_displayed_including_taxes) {
57
-        $ticket_price_includes_taxes = esc_html__('* price includes taxes', 'event_espresso');
58
-    } else {
59
-        $ticket_price_includes_taxes = esc_html__('* price does not include taxes', 'event_espresso');
60
-    }
61
-    echo '<p class="small-text lt-grey-text" style="text-align:right; margin: -1em 0 1em;">
56
+	if ($prices_displayed_including_taxes) {
57
+		$ticket_price_includes_taxes = esc_html__('* price includes taxes', 'event_espresso');
58
+	} else {
59
+		$ticket_price_includes_taxes = esc_html__('* price does not include taxes', 'event_espresso');
60
+	}
61
+	echo '<p class="small-text lt-grey-text" style="text-align:right; margin: -1em 0 1em;">
62 62
         ' . $ticket_price_includes_taxes . '
63 63
         </p>';
64 64
 }
@@ -68,12 +68,12 @@  discard block
 block discarded – undo
68 68
 
69 69
 <?php
70 70
 if ($max_atndz > 0) {
71
-    echo apply_filters(
72
-        'FHEE__ticket_selector_chart_template__maximum_tickets_purchased_footnote',
73
-        esc_html('')
74
-    );
71
+	echo apply_filters(
72
+		'FHEE__ticket_selector_chart_template__maximum_tickets_purchased_footnote',
73
+		esc_html('')
74
+	);
75 75
 }
76 76
 if (! apply_filters('FHEE__EE_Ticket_Selector__display_ticket_selector_submit', false)) {
77
-    add_filter('FHEE__EE_Ticket_Selector__no_ticket_selector_submit', '__return_true');
77
+	add_filter('FHEE__EE_Ticket_Selector__no_ticket_selector_submit', '__return_true');
78 78
 }
79 79
 do_action('AHEE__ticket_selector_chart__template__after_ticket_selector', $EVT_ID, $event);
Please login to merge, or discard this patch.
modules/ticket_selector/templates/simple_ticket_selector.template.php 2 patches
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -18,14 +18,14 @@  discard block
 block discarded – undo
18 18
     />
19 19
 <?php
20 20
 if ($ticket instanceof EE_Ticket) {
21
-    do_action('AHEE__ticket_selector_chart__template__before_ticket_selector', $event);
22
-    $ticket_description .= ! empty($ticket_description)
23
-        ? '<br />' . $ticket_status_display
24
-        : $ticket_status_display;
25
-    if (strpos($ticket_description, '<div') === false) {
26
-        $ticket_description = "<p>{$ticket_description}</p>";
27
-    }
28
-    ?>
21
+	do_action('AHEE__ticket_selector_chart__template__before_ticket_selector', $event);
22
+	$ticket_description .= ! empty($ticket_description)
23
+		? '<br />' . $ticket_status_display
24
+		: $ticket_status_display;
25
+	if (strpos($ticket_description, '<div') === false) {
26
+		$ticket_description = "<p>{$ticket_description}</p>";
27
+	}
28
+	?>
29 29
 <div id="no-tkt-slctr-ticket-dv-<?php echo esc_attr($EVT_ID); ?>" class="no-tkt-slctr-ticket-dv">
30 30
     <div class="no-tkt-slctr-ticket-content-dv">
31 31
         <h5><?php echo esc_html($ticket->name()); ?></h5>
@@ -34,5 +34,5 @@  discard block
 block discarded – undo
34 34
         <?php } ?>
35 35
     </div><!-- .no-tkt-slctr-ticket-content-dv -->
36 36
     <?php
37
-    do_action('AHEE__ticket_selector_chart__template__after_ticket_selector', $EVT_ID, $event);
37
+	do_action('AHEE__ticket_selector_chart__template__after_ticket_selector', $EVT_ID, $event);
38 38
 }
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 if ($ticket instanceof EE_Ticket) {
28 28
     do_action('AHEE__ticket_selector_chart__template__before_ticket_selector', $event);
29 29
     $ticket_description .= ! empty($ticket_description)
30
-        ? '<br />' . $ticket_status_display
30
+        ? '<br />'.$ticket_status_display
31 31
         : $ticket_status_display;
32 32
     if (strpos($ticket_description, '<div') === false) {
33 33
         $ticket_description = "<p>{$ticket_description}</p>";
@@ -36,7 +36,7 @@  discard block
 block discarded – undo
36 36
 <div id="no-tkt-slctr-ticket-dv-<?php echo esc_attr($EVT_ID); ?>" class="no-tkt-slctr-ticket-dv">
37 37
     <div class="no-tkt-slctr-ticket-content-dv">
38 38
         <h5><?php echo esc_html($ticket->name()); ?></h5>
39
-        <?php if (! empty($ticket_description)) { ?>
39
+        <?php if ( ! empty($ticket_description)) { ?>
40 40
             <?php echo wp_kses($ticket_description, AllowedTags::getAllowedTags()); ?>
41 41
         <?php } ?>
42 42
     </div><!-- .no-tkt-slctr-ticket-content-dv -->
Please login to merge, or discard this patch.
libraries/messages/defaults/default/html_receipt_attendee_list.template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -8,11 +8,11 @@
 block discarded – undo
8 8
 <li class="ticket-registration">
9 9
     <table class="registration-details">
10 10
         <tr class="odd">
11
-            <th><?php	_e('Attendee', 'event_espresso');?></th>
11
+            <th><?php	_e('Attendee', 'event_espresso'); ?></th>
12 12
             <td>[FNAME] [LNAME] ([ATTENDEE_EMAIL])</td>
13 13
         </tr>
14 14
         <tr>
15
-            <th><?php esc_html_e("Registration Code:", "event_espresso");?></th>
15
+            <th><?php esc_html_e("Registration Code:", "event_espresso"); ?></th>
16 16
             <td>[REGISTRATION_CODE] - <span class="[REGISTRATION_STATUS_ID]">[REGISTRATION_STATUS_LABEL]</span></td>
17 17
         </tr>
18 18
         <tr>
Please login to merge, or discard this patch.
payment_methods/Paypal_Pro/templates/paypal_pro_debug_info.template.php 1 patch
Indentation   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -17,39 +17,39 @@  discard block
 block discarded – undo
17 17
     <div class="sandbox-panel">
18 18
     <h2 class="section-title"><?php esc_html_e('PayPal Sandbox Mode', 'event_espresso'); ?></h2>
19 19
     <h3 style="color:#ff0000;"><?php
20
-        esc_html_e(
21
-            'Debug Mode Is Turned On. Payments will not be processed',
22
-            'event_espresso'
23
-        ); ?></h3>
20
+		esc_html_e(
21
+			'Debug Mode Is Turned On. Payments will not be processed',
22
+			'event_espresso'
23
+		); ?></h3>
24 24
 
25 25
     <p class="test-credit-cards-info-pg" style="margin-bottom:0;">
26 26
         <strong><?php esc_html_e('Testing Guidelines', 'event_espresso'); ?></strong>
27 27
     </p>
28 28
     <ul style="margin:1em 2em 1.5em; line-height:1.2em;">
29 29
         <li><?php
30
-            esc_html_e(
31
-                'While testing, use the credit card number associated with your sandbox account.',
32
-                'event_espresso'
33
-            ); ?></li>
30
+			esc_html_e(
31
+				'While testing, use the credit card number associated with your sandbox account.',
32
+				'event_espresso'
33
+			); ?></li>
34 34
         <li><?php
35
-            printf(
36
-                esc_html__(
37
-                    'To find the sandbox account\'s credit card, go to %1$s, then "Dashboard", then under Sandbox click "Accounts", then click your account and click "Profile", then in the popup that appears click on the "Funding" tab. Your testing card is listed there.',
38
-                    'event_espresso'
39
-                ),
40
-                '<a href="http://developer.paypal.com">developer.paypal.com</a>'
41
-            ); ?></li>
35
+			printf(
36
+				esc_html__(
37
+					'To find the sandbox account\'s credit card, go to %1$s, then "Dashboard", then under Sandbox click "Accounts", then click your account and click "Profile", then in the popup that appears click on the "Funding" tab. Your testing card is listed there.',
38
+					'event_espresso'
39
+				),
40
+				'<a href="http://developer.paypal.com">developer.paypal.com</a>'
41
+			); ?></li>
42 42
         <li><?php
43
-            esc_html_e('CVV2 should be 115', 'event_espresso'); ?></li>
43
+			esc_html_e('CVV2 should be 115', 'event_espresso'); ?></li>
44 44
     </ul>
45 45
 
46 46
     <p class="test-credit-cards-info-pg">
47 47
         <strong><?php esc_html_e('Credit Card Numbers Used for Testing', 'event_espresso'); ?></strong><br/>
48 48
         <span class="small-text"><?php
49
-            esc_html_e(
50
-                'Use the following credit card numbers for testing. Any other card number produces a general failure.',
51
-                'event_espresso'
52
-            ); ?></span>
49
+			esc_html_e(
50
+				'Use the following credit card numbers for testing. Any other card number produces a general failure.',
51
+				'event_espresso'
52
+			); ?></span>
53 53
     </p>
54 54
 
55 55
     <div class="tbl-wrap">
@@ -73,18 +73,18 @@  discard block
 block discarded – undo
73 73
     <p class="test-credit-cards-info-pg">
74 74
         <strong><?php esc_html_e('Testing Result Code Responses', 'event_espresso'); ?></strong><br/>
75 75
         <span class="small-text"><?php
76
-            printf(
77
-                esc_html__(
78
-                    'You can use the amount of the transaction to generate a particular result code (see %s PayPal\'s documentation%s). The table below lists the general guidelines for specifying amounts. IMPORTANT: before you attempt any of these, ensure your sandbox PayPal account has %s "Negative Testing" set to on%s. Also be aware that you can generate AVS errors by using certain strings in your address field, and CVV errors using certain CVV values. See %s this PayPal doc %s',
79
-                    'event_espresso'
80
-                ),
81
-                "<a href='https://developer.paypal.com/docs/classic/api/errorcodes/#id09C3GA00GR1' target='_blank'>",
82
-                "</a>",
83
-                "<a href='https://docs.google.com/a/eventespresso.com/file/d/0B5P8GXTvZgfMNXNkZ2s5VUlHTUk/edit?usp=drivesdk' target='_blank'>",
84
-                "</a>",
85
-                "<a href='https://cms.paypal.com/ca/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_testing_SBTestErrorConditions' target='_blank'>",
86
-                "</a>"
87
-            ); ?></span>
76
+			printf(
77
+				esc_html__(
78
+					'You can use the amount of the transaction to generate a particular result code (see %s PayPal\'s documentation%s). The table below lists the general guidelines for specifying amounts. IMPORTANT: before you attempt any of these, ensure your sandbox PayPal account has %s "Negative Testing" set to on%s. Also be aware that you can generate AVS errors by using certain strings in your address field, and CVV errors using certain CVV values. See %s this PayPal doc %s',
79
+					'event_espresso'
80
+				),
81
+				"<a href='https://developer.paypal.com/docs/classic/api/errorcodes/#id09C3GA00GR1' target='_blank'>",
82
+				"</a>",
83
+				"<a href='https://docs.google.com/a/eventespresso.com/file/d/0B5P8GXTvZgfMNXNkZ2s5VUlHTUk/edit?usp=drivesdk' target='_blank'>",
84
+				"</a>",
85
+				"<a href='https://cms.paypal.com/ca/cgi-bin/?cmd=_render-content&content_ID=developer/e_howto_testing_SBTestErrorConditions' target='_blank'>",
86
+				"</a>"
87
+			); ?></span>
88 88
     </p>
89 89
 
90 90
     <div class="tbl-wrap">
Please login to merge, or discard this patch.
payment_methods/Aim/templates/authorize_net_aim_debug_info.template.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -18,9 +18,9 @@
 block discarded – undo
18 18
 
19 19
         <p>
20 20
             <?php esc_html_e(
21
-                'Test Mode allows you to submit test transactions to the payment gateway. Transactions that are submitted while Test Mode is ON are NOT actually processed. The result of a transaction depends on the card number submitted, and the invoice amount. If you want a transaction to be approved, use one of the following card numbers.',
22
-                'event_espresso'
23
-            ); ?>
21
+				'Test Mode allows you to submit test transactions to the payment gateway. Transactions that are submitted while Test Mode is ON are NOT actually processed. The result of a transaction depends on the card number submitted, and the invoice amount. If you want a transaction to be approved, use one of the following card numbers.',
22
+				'event_espresso'
23
+			); ?>
24 24
         </p>
25 25
 
26 26
         <p>
Please login to merge, or discard this patch.
caffeinated/admin/hooks/Global_EE_Caf_Hooks.class.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -40,7 +40,7 @@
 block discarded – undo
40 40
 
41 41
     public function extra_news_box_content($content)
42 42
     {
43
-        echo '<h3 style="margin:0">' . esc_html__('From the Forums', 'event_espresso') . '</h3>';
43
+        echo '<h3 style="margin:0">'.esc_html__('From the Forums', 'event_espresso').'</h3>';
44 44
         echo '<div id="ee_forum_posts_content">';
45 45
         $url = 'https://eventespresso.com/forum/event-espresso-support/feed/';
46 46
         EE_Admin_Page::cached_rss_display('ee_forum_posts_content', $url);
Please login to merge, or discard this patch.
Indentation   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -14,42 +14,42 @@
 block discarded – undo
14 14
  */
15 15
 class Global_EE_Caf_Hooks
16 16
 {
17
-    public function __construct()
18
-    {
19
-        $this->_do_hooks();
20
-    }
17
+	public function __construct()
18
+	{
19
+		$this->_do_hooks();
20
+	}
21 21
 
22 22
 
23
-    private function _do_hooks()
24
-    {
25
-        add_filter('FHEE_show_sponsors_meta_box', '__return_false', 10);
26
-        add_filter('FHEE_show_ratings_request_meta_box', '__return_false', 10);
27
-        add_filter(
28
-            'FHEE__EE_Admin_Page_Core__load_global_scripts_styles__loader_containers',
29
-            array($this, 'forums_lazy_loading'),
30
-            10
31
-        );
32
-        add_action(
33
-            'AHEE__EE_Admin_Page__espresso_news_post_box__after_content',
34
-            array($this, 'extra_news_box_content'),
35
-            10
36
-        );
37
-    }
23
+	private function _do_hooks()
24
+	{
25
+		add_filter('FHEE_show_sponsors_meta_box', '__return_false', 10);
26
+		add_filter('FHEE_show_ratings_request_meta_box', '__return_false', 10);
27
+		add_filter(
28
+			'FHEE__EE_Admin_Page_Core__load_global_scripts_styles__loader_containers',
29
+			array($this, 'forums_lazy_loading'),
30
+			10
31
+		);
32
+		add_action(
33
+			'AHEE__EE_Admin_Page__espresso_news_post_box__after_content',
34
+			array($this, 'extra_news_box_content'),
35
+			10
36
+		);
37
+	}
38 38
 
39 39
 
40
-    public function extra_news_box_content($content)
41
-    {
42
-        echo '<h3 style="margin:0">' . esc_html__('From the Forums', 'event_espresso') . '</h3>';
43
-        echo '<div id="ee_forum_posts_content">';
44
-        $url = 'https://eventespresso.com/forum/event-espresso-support/feed/';
45
-        EE_Admin_Page::cached_rss_display('ee_forum_posts_content', $url);
46
-        echo '</div>';
47
-    }
40
+	public function extra_news_box_content($content)
41
+	{
42
+		echo '<h3 style="margin:0">' . esc_html__('From the Forums', 'event_espresso') . '</h3>';
43
+		echo '<div id="ee_forum_posts_content">';
44
+		$url = 'https://eventespresso.com/forum/event-espresso-support/feed/';
45
+		EE_Admin_Page::cached_rss_display('ee_forum_posts_content', $url);
46
+		echo '</div>';
47
+	}
48 48
 
49 49
 
50
-    public function forums_lazy_loading($ids)
51
-    {
52
-        $ids[] = 'ee_forum_posts_content';
53
-        return $ids;
54
-    }
50
+	public function forums_lazy_loading($ids)
51
+	{
52
+		$ids[] = 'ee_forum_posts_content';
53
+		return $ids;
54
+	}
55 55
 }
Please login to merge, or discard this patch.
caffeinated/admin/extend/events/help_tabs/import_page.help_tab.php 1 patch
Indentation   +29 added lines, -29 removed lines patch added patch discarded remove patch
@@ -1,48 +1,48 @@
 block discarded – undo
1 1
 <p><strong><?php esc_html_e('Importing CSV Event Espresso Data', 'event_espresso'); ?></strong></p>
2 2
 <p>
3 3
     <?php esc_html_e(
4
-        'The importer can be used to import event information into Event Espresso using a CSV file.',
5
-        'event_espresso'
6
-    ); ?>
4
+		'The importer can be used to import event information into Event Espresso using a CSV file.',
5
+		'event_espresso'
6
+	); ?>
7 7
 </p>
8 8
 <p><strong><?php esc_html_e("Importing from other Event Espresso 4 Sites", 'event_espresso'); ?></strong></p>
9 9
 <p>
10 10
     <?php esc_html_e(
11
-        'To import Event Espresso data from another Event Espresso 4 install, export a CSV file from the admin Events overview page, or anywhere you can generate a CSV export file from. Then upload that file here (regardless of what type of information was exported).',
12
-        'event_espresso'
13
-    ); ?>
11
+		'To import Event Espresso data from another Event Espresso 4 install, export a CSV file from the admin Events overview page, or anywhere you can generate a CSV export file from. Then upload that file here (regardless of what type of information was exported).',
12
+		'event_espresso'
13
+	); ?>
14 14
 </p>
15 15
 <p>
16 16
     <?php esc_html_e(
17
-        'Note: its possible that data from the other site have the same IDs as data in this site. The importer recognizes that this data is from a different database and inserts new items for each item in the CSV file, regardless of whether its ID matches that of an item in this site\'s database or not. However, the importer also remembers the mapping from the old site\'s database to this site\'s database, and on subsequent CSV importers from that site, the data in this database will be updated instead of re-inserting new items.',
18
-        'event_espresso'
19
-    ); ?>
17
+		'Note: its possible that data from the other site have the same IDs as data in this site. The importer recognizes that this data is from a different database and inserts new items for each item in the CSV file, regardless of whether its ID matches that of an item in this site\'s database or not. However, the importer also remembers the mapping from the old site\'s database to this site\'s database, and on subsequent CSV importers from that site, the data in this database will be updated instead of re-inserting new items.',
18
+		'event_espresso'
19
+	); ?>
20 20
 </p>
21 21
 <p><strong><?php esc_html_e("Importing from this Site", 'event_espresso'); ?></strong></p>
22 22
 <p><?php
23
-    esc_html_e(
24
-        "You may want to export data from this site, modify it (or modify the database), and re-import it. When this is done, the importer recognizes that the data is from this site\'s database and updates the records (instead of inserting new items like it would have, had the CSV data been from a different site).",
25
-        'event_espresso'
26
-    ); ?></p>
23
+	esc_html_e(
24
+		"You may want to export data from this site, modify it (or modify the database), and re-import it. When this is done, the importer recognizes that the data is from this site\'s database and updates the records (instead of inserting new items like it would have, had the CSV data been from a different site).",
25
+		'event_espresso'
26
+	); ?></p>
27 27
 
28 28
 <p><strong><?php esc_html_e("Notes about Generating your own CSV Import Files", "event_espresso"); ?></strong></p>
29 29
 <p><?php
30
-    esc_html_e(
31
-        "If you think you could save time entering data into a CSV file, you can use the sample import file below. Note that creating your own CSV file is more complicated than in Event Espresso 3.1 because of the more advanced data structure, and so we recommend creating/editing your events using the normal web-interface.",
32
-        "event_espresso"
33
-    ); ?></p>
30
+	esc_html_e(
31
+		"If you think you could save time entering data into a CSV file, you can use the sample import file below. Note that creating your own CSV file is more complicated than in Event Espresso 3.1 because of the more advanced data structure, and so we recommend creating/editing your events using the normal web-interface.",
32
+		"event_espresso"
33
+	); ?></p>
34 34
 <p><?php
35
-    esc_html_e(
36
-        "The export file is just an export of an event, or if you do not have any events in your system, it will only contain column headers. Do not change those column headers. Add as many rows as you like. ",
37
-        "event_espresso"
38
-    ); ?></p>
35
+	esc_html_e(
36
+		"The export file is just an export of an event, or if you do not have any events in your system, it will only contain column headers. Do not change those column headers. Add as many rows as you like. ",
37
+		"event_espresso"
38
+	); ?></p>
39 39
 <p><?php
40
-    esc_html_e(
41
-        "In the ID columns (columns ending in '_ID'), you should enter 'temporary IDs', which are unique numbers/words that identify that item, which can be used later when you want to refer to that item. (For example, if you assign an event's EVT_ID to be a temporary id of 'my-event-1', then use that same phrase 'my-event-1' to refer to that event in the Datetime model's EVT_ID column)",
42
-        "event_espresso"
43
-    ); ?></p>
40
+	esc_html_e(
41
+		"In the ID columns (columns ending in '_ID'), you should enter 'temporary IDs', which are unique numbers/words that identify that item, which can be used later when you want to refer to that item. (For example, if you assign an event's EVT_ID to be a temporary id of 'my-event-1', then use that same phrase 'my-event-1' to refer to that event in the Datetime model's EVT_ID column)",
42
+		"event_espresso"
43
+	); ?></p>
44 44
 <p><?php
45
-    esc_html_e(
46
-        "Also note, you do NOT have to enter info in for each model. (You can, for example, only enter in Term_Taxonomies and Term model data)",
47
-        "event_espresso"
48
-    ); ?></p>
49 45
\ No newline at end of file
46
+	esc_html_e(
47
+		"Also note, you do NOT have to enter info in for each model. (You can, for example, only enter in Term_Taxonomies and Term model data)",
48
+		"event_espresso"
49
+	); ?></p>
50 50
\ No newline at end of file
Please login to merge, or discard this patch.