Completed
Branch ENH/prevent-img-src-check-fata... (8c70e2)
by
unknown
07:29 queued 03:32
created
help_tabs/transactions_overview_views_filters_search.help_tab.php 1 patch
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -3,9 +3,9 @@  discard block
 block discarded – undo
3 3
 </p>
4 4
 <p>
5 5
     <?php esc_html_e(
6
-        'Views allow you to restrict what you see in the Transactions Overview table. The following views are available: View All. The number in parentheses next to each view represents the number of transactions that will be displayed with that view.',
7
-        'event_espresso'
8
-    ); ?>
6
+		'Views allow you to restrict what you see in the Transactions Overview table. The following views are available: View All. The number in parentheses next to each view represents the number of transactions that will be displayed with that view.',
7
+		'event_espresso'
8
+	); ?>
9 9
     <br />
10 10
 </p>
11 11
 <ul>
@@ -13,31 +13,31 @@  discard block
 block discarded – undo
13 13
         <strong><?php esc_html_e('View All Transactions', 'event_espresso'); ?></strong>
14 14
         <br />
15 15
         <?php printf(
16
-            esc_html__(
17
-                'Shows transactions where the registrant has completed the full registration process. Transactions in this view will either have a status of: %1$s%2$s"Incomplete" meaning there are monies owing%3$s%2$s"Complete" meaning there are NO monies owing%3$s%2$s"Overpaid" meaning that monies should be refunded to the registrant.%3$s%4$s',
18
-                'event_espresso'
19
-            ),
20
-            '<ul>',
21
-            '<li>',
22
-            '</li>',
23
-            '</ul>'
24
-        ); ?>
16
+			esc_html__(
17
+				'Shows transactions where the registrant has completed the full registration process. Transactions in this view will either have a status of: %1$s%2$s"Incomplete" meaning there are monies owing%3$s%2$s"Complete" meaning there are NO monies owing%3$s%2$s"Overpaid" meaning that monies should be refunded to the registrant.%3$s%4$s',
18
+				'event_espresso'
19
+			),
20
+			'<ul>',
21
+			'<li>',
22
+			'</li>',
23
+			'</ul>'
24
+		); ?>
25 25
     </li>
26 26
     <li>
27 27
         <strong><?php esc_html_e('Abandoned Transactions', 'event_espresso'); ?></strong>
28 28
         <br />
29 29
         <?php esc_html_e(
30
-            'Shows transactions that have been abandoned, either due to a technical reason (server or computer crash during registration), or due to an abandoned cart where the registrant chose not to complete the registration process. Please note that Abandoned Transactions were able to capture contact information for at least one registrant. This can be helpful for following up with the contact to determine if they still wish to attend the event or not.',
31
-            'event_espresso'
32
-        ); ?>
30
+			'Shows transactions that have been abandoned, either due to a technical reason (server or computer crash during registration), or due to an abandoned cart where the registrant chose not to complete the registration process. Please note that Abandoned Transactions were able to capture contact information for at least one registrant. This can be helpful for following up with the contact to determine if they still wish to attend the event or not.',
31
+			'event_espresso'
32
+		); ?>
33 33
     </li>
34 34
     <li>
35 35
         <strong><?php esc_html_e('Failed Transactions', 'event_espresso'); ?></strong>
36 36
         <br />
37 37
         <?php esc_html_e(
38
-            'Shows transactions that have failed, either due to a technical reason (server or computer crash during registration), or some other reason that prevented the collection of any useful contact information from any of the registrants. This could mean the registrant abandoned the registration process before submitting any data whatsoever or may even indicate attempts by spam bots to submit the registration form.',
39
-            'event_espresso'
40
-        ); ?>
38
+			'Shows transactions that have failed, either due to a technical reason (server or computer crash during registration), or some other reason that prevented the collection of any useful contact information from any of the registrants. This could mean the registrant abandoned the registration process before submitting any data whatsoever or may even indicate attempts by spam bots to submit the registration form.',
39
+			'event_espresso'
40
+		); ?>
41 41
     </li>
42 42
 </ul>
43 43
 <p>
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 </p>
59 59
 <p>
60 60
     <?php esc_html_e(
61
-        'You can perform a search to find specific transactions. The following sources will be searched: Event Name (title), Event Description, First Name, Last Name, Bio, Email, Address, Comments, Notes, Registration Final Price, Registration Code, Registration Group Size, Ticket Name, Ticket Description, Payment Method, Payment Gateway, Transaction Details, and Transaction Session Data. To use the search feature, enter a value into the search box and click on the Search Transactions button.',
62
-        'event_espresso'
63
-    ); ?>
61
+		'You can perform a search to find specific transactions. The following sources will be searched: Event Name (title), Event Description, First Name, Last Name, Bio, Email, Address, Comments, Notes, Registration Final Price, Registration Code, Registration Group Size, Ticket Name, Ticket Description, Payment Method, Payment Gateway, Transaction Details, and Transaction Session Data. To use the search feature, enter a value into the search box and click on the Search Transactions button.',
62
+		'event_espresso'
63
+	); ?>
64 64
 </p>
65 65
\ No newline at end of file
Please login to merge, or discard this patch.
help_tabs/transactions_view_transaction_attendees_registered.help_tab.php 1 patch
Indentation   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -6,17 +6,17 @@
 block discarded – undo
6 6
         <strong><?php esc_html_e('#', 'event_espresso'); ?></strong>
7 7
         <br />
8 8
         <?php esc_html_e(
9
-            'Shows the registrant number in the group. For example, 1 of 1 means that there was a single registrant. 1 of 2 means that this registrant is the first to register of the the two registrants in the group.',
10
-            'event_espresso'
11
-        ); ?>
9
+			'Shows the registrant number in the group. For example, 1 of 1 means that there was a single registrant. 1 of 2 means that this registrant is the first to register of the the two registrants in the group.',
10
+			'event_espresso'
11
+		); ?>
12 12
     </li>
13 13
     <li>
14 14
         <strong><?php esc_html_e('Event Name and Ticket', 'event_espresso'); ?></strong>
15 15
         <br />
16 16
         <?php esc_html_e(
17
-            'Shows the name (title) of the event and the name of the ticket associated with this event.',
18
-            'event_espresso'
19
-        ); ?>
17
+			'Shows the name (title) of the event and the name of the ticket associated with this event.',
18
+			'event_espresso'
19
+		); ?>
20 20
     </li>
21 21
     <li>
22 22
         <strong><?php esc_html_e('Registrant', 'event_espresso'); ?></strong>
Please login to merge, or discard this patch.
...ons_view_transaction_primary_registrant_billing_information.help_tab.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -28,9 +28,9 @@
 block discarded – undo
28 28
 </ul>
29 29
 <p>
30 30
     <?php esc_html_e(
31
-        'You can edit information about an Registrant by clicking on the View/Edit this Contact link.',
32
-        'event_espresso'
33
-    ); ?>
31
+		'You can edit information about an Registrant by clicking on the View/Edit this Contact link.',
32
+		'event_espresso'
33
+	); ?>
34 34
     <br />
35 35
 </p>
36 36
 <p>
Please login to merge, or discard this patch.
transactions_view_transaction_transaction_details_table.help_tab.php 1 patch
Indentation   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -3,9 +3,9 @@  discard block
 block discarded – undo
3 3
 </p>
4 4
 <p>
5 5
     <?php esc_html_e(
6
-        'This area of the table shows information about any events that were included in this transactions.',
7
-        'event_espresso'
8
-    ); ?>
6
+		'This area of the table shows information about any events that were included in this transactions.',
7
+		'event_espresso'
8
+	); ?>
9 9
 </p>
10 10
 <ul>
11 11
     <li>
@@ -42,17 +42,17 @@  discard block
 block discarded – undo
42 42
         <strong><?php esc_html_e('Line Total', 'event_espresso'); ?></strong>
43 43
         <br />
44 44
         <?php esc_html_e(
45
-            'Shows the total based on the quantity of tickets multiplied by the price of each ticket.',
46
-            'event_espresso'
47
-        ); ?>
45
+			'Shows the total based on the quantity of tickets multiplied by the price of each ticket.',
46
+			'event_espresso'
47
+		); ?>
48 48
     </li>
49 49
     <li>
50 50
         <strong><?php esc_html_e('Taxes', 'event_espresso'); ?></strong>
51 51
         <br />
52 52
         <?php esc_html_e(
53
-            'Shows any taxes that have been applied. May be listed as a sales tax or a federal tax.',
54
-            'event_espresso'
55
-        ); ?>
53
+			'Shows any taxes that have been applied. May be listed as a sales tax or a federal tax.',
54
+			'event_espresso'
55
+		); ?>
56 56
     </li>
57 57
     <li>
58 58
         <strong><?php esc_html_e('Transaction Total', 'event_espresso'); ?></strong>
Please login to merge, or discard this patch.
support/templates/support_admin_details_important_information.template.php 2 patches
Indentation   +52 added lines, -52 removed lines patch added patch discarded remove patch
@@ -1,60 +1,60 @@
 block discarded – undo
1 1
 <div class="padding">
2 2
     <?php
3
-    global $wpdb, $wp_version;
4
-    $wp_req_version    = '3.1';
5
-    $php_req_version   = '5.2';
6
-    $mysql_req_version = '5.0';
7
-    $php_is_valid      = version_compare(phpversion(), $php_req_version, '>');
8
-    $mysql_is_valid    = version_compare($wpdb->db_version(), $mysql_req_version, '>');
9
-    $wp_is_valid    = version_compare($wp_version, $wp_req_version, '>=');
3
+	global $wpdb, $wp_version;
4
+	$wp_req_version    = '3.1';
5
+	$php_req_version   = '5.2';
6
+	$mysql_req_version = '5.0';
7
+	$php_is_valid      = version_compare(phpversion(), $php_req_version, '>');
8
+	$mysql_is_valid    = version_compare($wpdb->db_version(), $mysql_req_version, '>');
9
+	$wp_is_valid    = version_compare($wp_version, $wp_req_version, '>=');
10 10
 
11
-    if (! $wp_is_valid) {
12
-        echo esc_html(
13
-            '<p class="red_alert">'
14
-             . __(
15
-                 'This version of Event Espresso requires WordPress version',
16
-                 'event_espresso'
17
-             )
18
-             . " $wp_req_version+. "
19
-             . __(
20
-                 'Please upgrade to the latest version of WordPress.',
21
-                 'event_espresso'
22
-             )
23
-             . '</p>'
24
-        );
25
-    }
26
-    if (! $php_is_valid) {
27
-        echo esc_html(
28
-            '<p class="red_alert">'
29
-             . __(
30
-                 'Your version of PHP is out of date, please update to the latest version of PHP. <br>Required version of PHP:',
31
-                 'event_espresso'
32
-             )
33
-             . " $php_req_version"
34
-             . '</p>'
35
-        );
36
-    }
37
-    if (! $mysql_is_valid) {
38
-        echo esc_html(
39
-            '<p class="red_alert">'
40
-             . __(
41
-                 'Your version of MySQL is out of date, please update to the latest version of MySQL. <br>Required version of MySQL:',
42
-                 'event_espresso'
43
-             )
44
-             . " $mysql_req_version"
45
-             . '</p>'
46
-        );
47
-    }
11
+	if (! $wp_is_valid) {
12
+		echo esc_html(
13
+			'<p class="red_alert">'
14
+			 . __(
15
+				 'This version of Event Espresso requires WordPress version',
16
+				 'event_espresso'
17
+			 )
18
+			 . " $wp_req_version+. "
19
+			 . __(
20
+				 'Please upgrade to the latest version of WordPress.',
21
+				 'event_espresso'
22
+			 )
23
+			 . '</p>'
24
+		);
25
+	}
26
+	if (! $php_is_valid) {
27
+		echo esc_html(
28
+			'<p class="red_alert">'
29
+			 . __(
30
+				 'Your version of PHP is out of date, please update to the latest version of PHP. <br>Required version of PHP:',
31
+				 'event_espresso'
32
+			 )
33
+			 . " $php_req_version"
34
+			 . '</p>'
35
+		);
36
+	}
37
+	if (! $mysql_is_valid) {
38
+		echo esc_html(
39
+			'<p class="red_alert">'
40
+			 . __(
41
+				 'Your version of MySQL is out of date, please update to the latest version of MySQL. <br>Required version of MySQL:',
42
+				 'event_espresso'
43
+			 )
44
+			 . " $mysql_req_version"
45
+			 . '</p>'
46
+		);
47
+	}
48 48
 
49
-    $system_status_link = EE_Admin_Page::add_query_args_and_nonce(
50
-        [
51
-            'page'   => 'espresso_maintenance_settings',
52
-            'action' => 'system_status',
53
-        ],
54
-        admin_url('admin.php')
55
-    );
49
+	$system_status_link = EE_Admin_Page::add_query_args_and_nonce(
50
+		[
51
+			'page'   => 'espresso_maintenance_settings',
52
+			'action' => 'system_status',
53
+		],
54
+		admin_url('admin.php')
55
+	);
56 56
 
57
-    ?>
57
+	?>
58 58
     <a href="<?php echo esc_url_raw($system_status_link); ?>" class="button-secondary right">
59 59
         <?php esc_html_e('System Information', 'event_espresso'); ?>
60 60
     </a>
Please login to merge, or discard this patch.
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -6,9 +6,9 @@  discard block
 block discarded – undo
6 6
     $mysql_req_version = '5.0';
7 7
     $php_is_valid      = version_compare(phpversion(), $php_req_version, '>');
8 8
     $mysql_is_valid    = version_compare($wpdb->db_version(), $mysql_req_version, '>');
9
-    $wp_is_valid    = version_compare($wp_version, $wp_req_version, '>=');
9
+    $wp_is_valid = version_compare($wp_version, $wp_req_version, '>=');
10 10
 
11
-    if (! $wp_is_valid) {
11
+    if ( ! $wp_is_valid) {
12 12
         echo esc_html(
13 13
             '<p class="red_alert">'
14 14
              . __(
@@ -23,7 +23,7 @@  discard block
 block discarded – undo
23 23
              . '</p>'
24 24
         );
25 25
     }
26
-    if (! $php_is_valid) {
26
+    if ( ! $php_is_valid) {
27 27
         echo esc_html(
28 28
             '<p class="red_alert">'
29 29
              . __(
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
              . '</p>'
35 35
         );
36 36
     }
37
-    if (! $mysql_is_valid) {
37
+    if ( ! $mysql_is_valid) {
38 38
         echo esc_html(
39 39
             '<p class="red_alert">'
40 40
              . __(
Please login to merge, or discard this patch.
templates/support_admin_details_shortcodes_event_listings.template.php 1 patch
Indentation   +31 added lines, -31 removed lines patch added patch discarded remove patch
@@ -1,19 +1,19 @@  discard block
 block discarded – undo
1 1
 <div class="padding">
2 2
     <p>
3 3
         <?php
4
-        esc_html_e(
5
-            'Displays a list of events based on a set of criteria on a WordPress page or post. Unless otherwise specified, events are sorted by start date.',
6
-            'event_espresso'
7
-        );
8
-        printf(
9
-            esc_html__(
10
-                'For a full list of available shortcodes, please view the %sshortcode documentation%s on our website.',
11
-                'event_espresso'
12
-            ),
13
-            '<a href="https://eventespresso.com/wiki/ee4-shortcodes-template-variables/">',
14
-            '</a>'
15
-        );
16
-        ?>
4
+		esc_html_e(
5
+			'Displays a list of events based on a set of criteria on a WordPress page or post. Unless otherwise specified, events are sorted by start date.',
6
+			'event_espresso'
7
+		);
8
+		printf(
9
+			esc_html__(
10
+				'For a full list of available shortcodes, please view the %sshortcode documentation%s on our website.',
11
+				'event_espresso'
12
+			),
13
+			'<a href="https://eventespresso.com/wiki/ee4-shortcodes-template-variables/">',
14
+			'</a>'
15
+		);
16
+		?>
17 17
     </p>
18 18
     <ul>
19 19
         <li>
@@ -36,11 +36,11 @@  discard block
 block discarded – undo
36 36
         <li>
37 37
             <strong>
38 38
                 <?php
39
-                esc_html_e(
40
-                    'Limit (paginate) the number of events that are shown in the event list on a page or post',
41
-                    'event_espresso'
42
-                );
43
-                ?>
39
+				esc_html_e(
40
+					'Limit (paginate) the number of events that are shown in the event list on a page or post',
41
+					'event_espresso'
42
+				);
43
+				?>
44 44
             </strong>
45 45
             <br />
46 46
             [ESPRESSO_EVENTS limit=5]
@@ -83,11 +83,11 @@  discard block
 block discarded – undo
83 83
         <li>
84 84
             <strong>
85 85
                 <?php
86
-                esc_html_e(
87
-                    'Order the event list by a specific set of parameters (refer to available options below)',
88
-                    'event_espresso'
89
-                );
90
-                ?>
86
+				esc_html_e(
87
+					'Order the event list by a specific set of parameters (refer to available options below)',
88
+					'event_espresso'
89
+				);
90
+				?>
91 91
             </strong>
92 92
             <br />
93 93
             [ESPRESSO_EVENTS order_by=start_date,id]
@@ -95,14 +95,14 @@  discard block
 block discarded – undo
95 95
     </ul>
96 96
     <p>
97 97
         <?php
98
-        echo sprintf(
99
-            esc_html__(
100
-                'These parameters (options) are available for the %s shortcode parameter above. Multiple parameters should be separated by a comma.',
101
-                'event_espresso'
102
-            ),
103
-            'order_by'
104
-        );
105
-        ?>
98
+		echo sprintf(
99
+			esc_html__(
100
+				'These parameters (options) are available for the %s shortcode parameter above. Multiple parameters should be separated by a comma.',
101
+				'event_espresso'
102
+			),
103
+			'order_by'
104
+		);
105
+		?>
106 106
     </p>
107 107
     <p>
108 108
         id<br />
Please login to merge, or discard this patch.
support/templates/support_admin_details_installation.template.php 1 patch
Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@
 block discarded – undo
1 1
 <div class="padding">
2 2
     <!-- <p><?php esc_html_e(
3
-        'Download the <a href="https://eventespresso.com/wp-content/plugins/download-monitor/download.php?id=2">Installation Guide</a> as a PDF',
4
-        'event_espresso'
5
-    ); ?></p> -->
3
+		'Download the <a href="https://eventespresso.com/wp-content/plugins/download-monitor/download.php?id=2">Installation Guide</a> as a PDF',
4
+		'event_espresso'
5
+	); ?></p> -->
6 6
     <p>
7 7
         <?php esc_html_e('For the latest installation instructions please visit:', 'event_espresso'); ?>
8 8
         <a href="https://eventespresso.com/wiki/installing-event-espresso/" target="_blank">https://eventespresso.com/wiki/installing-event-espresso/</a>
Please login to merge, or discard this patch.
admin_pages/messages/templates/ee_msg_messenger_help_tab.template.php 1 patch
Indentation   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -1,11 +1,11 @@
 block discarded – undo
1 1
 <h2><?php esc_html_e('What are Messengers?', 'event_espresso'); ?></h2>
2 2
 <p>
3 3
     <?php printf(
4
-        esc_html__(
5
-            'Messengers are the vehicles that deliver messages to people.  By default, every Event Espresso install has the %sEmail%s messenger already active. The Email messenger is a vehicle for delivering messages.  Other possible vehicles might be any social media applications, 3rd Party API\'s etc.',
6
-            'event_espresso'
7
-        ),
8
-        '<strong>',
9
-        '</strong>'
10
-    ); ?>
4
+		esc_html__(
5
+			'Messengers are the vehicles that deliver messages to people.  By default, every Event Espresso install has the %sEmail%s messenger already active. The Email messenger is a vehicle for delivering messages.  Other possible vehicles might be any social media applications, 3rd Party API\'s etc.',
6
+			'event_espresso'
7
+		),
8
+		'<strong>',
9
+		'</strong>'
10
+	); ?>
11 11
 </p>
12 12
\ No newline at end of file
Please login to merge, or discard this patch.
messages/templates/ee_msg_messages_settings_help_tab.template.php 1 patch
Indentation   +44 added lines, -44 removed lines patch added patch discarded remove patch
@@ -15,80 +15,80 @@
 block discarded – undo
15 15
 <h3><?php esc_html_e('1. Defaults', 'event_espresso'); ?></h3>
16 16
 <p>
17 17
     <?php esc_html_e(
18
-        'When Event Espresso is first activated, the plugin takes care of setting up the core messenger (Email) and message types (Registration, and Payment).  This is so users don\'t have to worry about any setup of templates etc. and it just works right out of the box.  So when you first visit the page you\'ll see the Email messenger displayed with those two message types in the "Active" area for that messenger',
19
-        'event_espresso'
20
-    ); ?>
18
+		'When Event Espresso is first activated, the plugin takes care of setting up the core messenger (Email) and message types (Registration, and Payment).  This is so users don\'t have to worry about any setup of templates etc. and it just works right out of the box.  So when you first visit the page you\'ll see the Email messenger displayed with those two message types in the "Active" area for that messenger',
19
+		'event_espresso'
20
+	); ?>
21 21
 </p>
22 22
 <h3><?php esc_html_e('2. Activating or Deactivating Messengers', 'event_espresso'); ?></h3>
23 23
 <p>
24 24
     <?php esc_html_e(
25
-        'You can select messengers via the tabs across the top of the settings page.  The available messengers you see depends on what version of Event Espresso you have and what addons are installed.  Every install will see at the very least an "Email" messenger tab.  When you click one of those tabs it will display that messenger.',
26
-        'event_espresso'
27
-    ); ?>
25
+		'You can select messengers via the tabs across the top of the settings page.  The available messengers you see depends on what version of Event Espresso you have and what addons are installed.  Every install will see at the very least an "Email" messenger tab.  When you click one of those tabs it will display that messenger.',
26
+		'event_espresso'
27
+	); ?>
28 28
 </p>
29 29
 <p>
30 30
     <?php esc_html_e(
31
-        'There are two ways to determine whether a messenger is active or not.  The first way is via the messenger tab itself.',
32
-        'event_espresso'
33
-    ); ?>
31
+		'There are two ways to determine whether a messenger is active or not.  The first way is via the messenger tab itself.',
32
+		'event_espresso'
33
+	); ?>
34 34
 </p>
35 35
 <p>
36 36
     <?php echo esc_html($img1);
37
-    esc_html_e('The green colored gear indicates that this messenger is currently active.', 'event_espresso');
38
-    echo esc_html($img2);
39
-    esc_html_e(
40
-        'Here the white colored gear indicates the messenger is inactive. This is very helpful for seeing at a glance all the messengers that are active when you first view the page.',
41
-        'event_espresso'
42
-    ); ?>
37
+	esc_html_e('The green colored gear indicates that this messenger is currently active.', 'event_espresso');
38
+	echo esc_html($img2);
39
+	esc_html_e(
40
+		'Here the white colored gear indicates the messenger is inactive. This is very helpful for seeing at a glance all the messengers that are active when you first view the page.',
41
+		'event_espresso'
42
+	); ?>
43 43
 </p>
44 44
 <p>
45 45
     <?php esc_html_e(
46
-        'The second way to determine whether a messenger is active or not is via the "on/off" button in the top right corner of the active messenger displayed content:',
47
-        'event_espresso'
48
-    ); ?>
46
+		'The second way to determine whether a messenger is active or not is via the "on/off" button in the top right corner of the active messenger displayed content:',
47
+		'event_espresso'
48
+	); ?>
49 49
 </p>
50 50
 <p>
51 51
     <?php echo esc_html($img3);
52
-    printf(
53
-        esc_html__(
54
-            'On means of course that the messenger is active and %s means the messenger is inactive.',
55
-            'event_espresso'
56
-        ),
57
-        $img4
58
-    ); ?>
52
+	printf(
53
+		esc_html__(
54
+			'On means of course that the messenger is active and %s means the messenger is inactive.',
55
+			'event_espresso'
56
+		),
57
+		$img4
58
+	); ?>
59 59
 </p>
60 60
 <p>
61 61
     <?php esc_html_e(
62
-        'Incidentally, the on/off toggle is also what you use to activate or deactivate a messenger.',
63
-        'event_espresso'
64
-    ); ?>
62
+		'Incidentally, the on/off toggle is also what you use to activate or deactivate a messenger.',
63
+		'event_espresso'
64
+	); ?>
65 65
 </p>
66 66
 <p>
67 67
     <?php esc_html_e(
68
-        'What happens when you click the toggle to activate is the messenger is activated and the system determines what default message types are activated with the messenger.  Then, if there are any default settings for either the messenger or message types those settings are saved.  Next, the system will generate any default templates (if none have been generated before, if there are previously generated templates then they are reactivated).  Finally, you will see the display change to reflect that the messenger is active. If the messenger has settings you can modify them then.  Any message types that have settings will also automatically expand so you can see the default settings and make any changes as necessary to fit your needs. Usually the defaults are sufficient however.',
69
-        'event_espresso'
70
-    ); ?>
68
+		'What happens when you click the toggle to activate is the messenger is activated and the system determines what default message types are activated with the messenger.  Then, if there are any default settings for either the messenger or message types those settings are saved.  Next, the system will generate any default templates (if none have been generated before, if there are previously generated templates then they are reactivated).  Finally, you will see the display change to reflect that the messenger is active. If the messenger has settings you can modify them then.  Any message types that have settings will also automatically expand so you can see the default settings and make any changes as necessary to fit your needs. Usually the defaults are sufficient however.',
69
+		'event_espresso'
70
+	); ?>
71 71
 </p>
72 72
 <p>
73 73
     <?php esc_html_e(
74
-        'When you deactivate a messenger, the system will first check if there are any custom event templates for that messenger.  If there are you will be unable to deactivate the messenger.  This is a fail safe to make sure you know that no messages will go out for those specific events so you don\'t accidentally deactivate.  If this check passes, then the system will deactivate any global templates for that messenger (note the templates are not erased, they just become inactive, so if you decide to reactivate the messenger later all your customizations are preserved). Then the display will change to reflect the deactivation.',
75
-        'event_espresso'
76
-    ); ?>
74
+		'When you deactivate a messenger, the system will first check if there are any custom event templates for that messenger.  If there are you will be unable to deactivate the messenger.  This is a fail safe to make sure you know that no messages will go out for those specific events so you don\'t accidentally deactivate.  If this check passes, then the system will deactivate any global templates for that messenger (note the templates are not erased, they just become inactive, so if you decide to reactivate the messenger later all your customizations are preserved). Then the display will change to reflect the deactivation.',
75
+		'event_espresso'
76
+	); ?>
77 77
 </p>
78 78
 <p>
79 79
     <?php printf(
80
-        esc_html__(
81
-            '%sVery important!%s Although customizations made to global templates are preserved when a messenger is deactivated, any settings for that messenger (or the message types that were attached to it) are lost on deactivation.  Keep that in mind. Also, once you deactivate a messenger, no more messages will be delivered using that messenger for any of your events.',
82
-            'event_espresso'
83
-        ),
84
-        '<strong>',
85
-        '</strong>'
86
-    ); ?>
80
+		esc_html__(
81
+			'%sVery important!%s Although customizations made to global templates are preserved when a messenger is deactivated, any settings for that messenger (or the message types that were attached to it) are lost on deactivation.  Keep that in mind. Also, once you deactivate a messenger, no more messages will be delivered using that messenger for any of your events.',
82
+			'event_espresso'
83
+		),
84
+		'<strong>',
85
+		'</strong>'
86
+	); ?>
87 87
 </p>
88 88
 <h3><?php esc_html_e('3. Activating or Deactivating Message Types', 'event_espresso'); ?></h3>
89 89
 <p>
90 90
     <?php esc_html_e(
91
-        'There may be times where you just want to deactivate (or activate new) message types for a particular messenger.  The messages system makes it super easy to do so.  To deactivate, what you do is drag the message type box from the "active area" below the messenger description (of an active messenger) into the "inactive" area in the right sidebar.  To activate you do the reverse.  Just remember that when you deactivate a message type, if that message type has any settings, the settings will be lost.  However, any message templates that match the messenger and message type you deactivated will be preserved, they are just marked "inactive" in the database',
92
-        'event_espresso'
93
-    ); ?>
91
+		'There may be times where you just want to deactivate (or activate new) message types for a particular messenger.  The messages system makes it super easy to do so.  To deactivate, what you do is drag the message type box from the "active area" below the messenger description (of an active messenger) into the "inactive" area in the right sidebar.  To activate you do the reverse.  Just remember that when you deactivate a message type, if that message type has any settings, the settings will be lost.  However, any message templates that match the messenger and message type you deactivated will be preserved, they are just marked "inactive" in the database',
92
+		'event_espresso'
93
+	); ?>
94 94
 </p>
95 95
\ No newline at end of file
Please login to merge, or discard this patch.