Completed
Branch BUG-9583-fix-fetching-term-rel... (646110)
by
unknown
539:15 queued 523:53
created
core/libraries/messages/EE_Registration_Base_message_type.lib.php 2 patches
Braces   +9 added lines, -5 removed lines patch added patch discarded remove patch
@@ -6,7 +6,9 @@  discard block
 block discarded – undo
6 6
  * @subpackage messages
7 7
  * @since           4.5.0
8 8
  */
9
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
9
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
10
+	exit('No direct script access allowed');
11
+}
10 12
 
11 13
 /**
12 14
  * This class contains common methods/properties shared among all registration message types.
@@ -125,16 +127,18 @@  discard block
 block discarded – undo
125 127
 	 * @return array array of EE_Messages_Addressee objects
126 128
 	 */
127 129
 	protected function _admin_addressees() {
128
-		if ( $this->_single_message )
129
-			return array();
130
+		if ( $this->_single_message ) {
131
+					return array();
132
+		}
130 133
 		return parent::_admin_addressees();
131 134
 	}
132 135
 
133 136
 
134 137
 
135 138
 	protected function _primary_attendee_addressees() {
136
-		if ( $this->_single_message )
137
-			return array();
139
+		if ( $this->_single_message ) {
140
+					return array();
141
+		}
138 142
 
139 143
 		return parent::_primary_attendee_addressees();
140 144
 	}
Please login to merge, or discard this patch.
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -38,35 +38,35 @@  discard block
 block discarded – undo
38 38
 	}
39 39
 
40 40
 
41
-	protected function _get_admin_content_events_edit_for_messenger( EE_messenger $messenger ) {
41
+	protected function _get_admin_content_events_edit_for_messenger(EE_messenger $messenger) {
42 42
 		//this is just a test
43
-		return $this->name . ' Message Type for ' . $messenger->name . ' Messenger ';
43
+		return $this->name.' Message Type for '.$messenger->name.' Messenger ';
44 44
 	}
45 45
 
46 46
 
47 47
 
48 48
 
49 49
 	protected function _set_data_handler() {
50
-		if ( is_array( $this->_data ) ) {
51
-			$data_type = reset( $this->_data );
50
+		if (is_array($this->_data)) {
51
+			$data_type = reset($this->_data);
52 52
 
53
-			if ( is_array( $data_type ) ) {
53
+			if (is_array($data_type)) {
54 54
 				//grab the first item and see if its a registration.
55
-				$maybe_reg = isset( $data_type[0] ) && is_array( $data_type[0] ) ? reset( $data_type[0] ) : reset( $data_type );
56
-				if ( $maybe_reg instanceof EE_Registration ) {
55
+				$maybe_reg = isset($data_type[0]) && is_array($data_type[0]) ? reset($data_type[0]) : reset($data_type);
56
+				if ($maybe_reg instanceof EE_Registration) {
57 57
 					//is $data_type itself just an array of registrations?
58
-					if ( isset( $data_type[1] ) && $data_type[1] instanceof EE_Registration  ) {
58
+					if (isset($data_type[1]) && $data_type[1] instanceof EE_Registration) {
59 59
 						$regs = $data_type;
60 60
 					} else {
61
-						$regs = is_array( $data_type[0] ) ? $data_type[0] : array( $maybe_reg );
61
+						$regs = is_array($data_type[0]) ? $data_type[0] : array($maybe_reg);
62 62
 					}
63 63
 
64
-					foreach ( $regs as $reg ) {
65
-						if ( $reg instanceof EE_Registration ) {
64
+					foreach ($regs as $reg) {
65
+						if ($reg instanceof EE_Registration) {
66 66
 							$this->_regs_for_sending[] = $reg->ID();
67 67
 						}
68 68
 					}
69
-					$this->_data = isset( $this->_data[1] ) ? array( $maybe_reg->transaction(), null, $this->_data[1] ) : array( $maybe_reg->transaction() );
69
+					$this->_data = isset($this->_data[1]) ? array($maybe_reg->transaction(), null, $this->_data[1]) : array($maybe_reg->transaction());
70 70
 					$this->_data_handler = 'Gateways';
71 71
 				} else {
72 72
 					$this->_data_handler = 'Gateways';
@@ -83,18 +83,18 @@  discard block
 block discarded – undo
83 83
 
84 84
 
85 85
 
86
-	protected function _get_data_for_context( $context, EE_Registration $registration, $id ) {
87
-		if ( $context  == 'admin' ) {
86
+	protected function _get_data_for_context($context, EE_Registration $registration, $id) {
87
+		if ($context == 'admin') {
88 88
 			//use the registration to get the transaction.
89 89
 			$transaction = $registration->transaction();
90 90
 
91 91
 			//bail early if no transaction
92
-			if ( ! $transaction instanceof EE_Transaction ) {
93
-				throw new EE_Error( __('The given registration does not have an associated transaction. Something is wrong.', 'event_espresso' ) );
92
+			if ( ! $transaction instanceof EE_Transaction) {
93
+				throw new EE_Error(__('The given registration does not have an associated transaction. Something is wrong.', 'event_espresso'));
94 94
 			}
95 95
 
96
-			$payment = !empty( $id ) ? EEM_Payment::instance()->get_one( array( array( 'PAY_ID' => $id, 'TXN_ID' => $transaction->ID() ) ) ) : 0;
97
-			return array( $transaction, $payment );
96
+			$payment = ! empty($id) ? EEM_Payment::instance()->get_one(array(array('PAY_ID' => $id, 'TXN_ID' => $transaction->ID()))) : 0;
97
+			return array($transaction, $payment);
98 98
 		} else {
99 99
 			return $registration;
100 100
 		}
@@ -120,7 +120,7 @@  discard block
 block discarded – undo
120 120
 	 * @return array array of EE_Messages_Addressee objects
121 121
 	 */
122 122
 	protected function _admin_addressees() {
123
-		if ( $this->_single_message )
123
+		if ($this->_single_message)
124 124
 			return array();
125 125
 		return parent::_admin_addressees();
126 126
 	}
@@ -128,7 +128,7 @@  discard block
 block discarded – undo
128 128
 
129 129
 
130 130
 	protected function _primary_attendee_addressees() {
131
-		if ( $this->_single_message )
131
+		if ($this->_single_message)
132 132
 			return array();
133 133
 
134 134
 		return parent::_primary_attendee_addressees();
Please login to merge, or discard this patch.
libraries/messages/data_class/EE_Messages_Gateways_incoming_data.class.php 2 patches
Braces   +8 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION') )
3
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
4 4
 	exit('NO direct script access allowed');
5
+}
5 6
 
6 7
 /**
7 8
  * Event Espresso
@@ -46,11 +47,13 @@  discard block
 block discarded – undo
46 47
 	public function __construct( $data ) {
47 48
 
48 49
 		//test for valid params
49
-		if ( ! ( $data[0] instanceof EE_Transaction ))
50
-			throw new EE_Error( __('Incoming data for the Gateways data handler must have an EE_Transaction object as the value for the first array index.', 'event_espresso') );
50
+		if ( ! ( $data[0] instanceof EE_Transaction )) {
51
+					throw new EE_Error( __('Incoming data for the Gateways data handler must have an EE_Transaction object as the value for the first array index.', 'event_espresso') );
52
+		}
51 53
 
52
-		if ( empty( $data[1] ) || ! $data[1] instanceof  EE_Payment  )
53
-			$pmt_obj = $this->_get_empty_payment_obj( $data[0] );
54
+		if ( empty( $data[1] ) || ! $data[1] instanceof  EE_Payment  ) {
55
+					$pmt_obj = $this->_get_empty_payment_obj( $data[0] );
56
+		}
54 57
 
55 58
 		if ( ! empty( $data[2] ) ) {
56 59
 			$filtered_reg_status = $data[2];
Please login to merge, or discard this patch.
Spacing   +22 added lines, -22 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if (!defined('EVENT_ESPRESSO_VERSION') )
3
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('NO direct script access allowed');
5 5
 
6 6
 /**
@@ -43,25 +43,25 @@  discard block
 block discarded – undo
43 43
 	 * @param array $data
44 44
 	 * @throws \EE_Error
45 45
 	 */
46
-	public function __construct( $data ) {
46
+	public function __construct($data) {
47 47
 
48 48
 		//test for valid params
49
-		if ( ! ( $data[0] instanceof EE_Transaction ))
50
-			throw new EE_Error( __('Incoming data for the Gateways data handler must have an EE_Transaction object as the value for the first array index.', 'event_espresso') );
49
+		if ( ! ($data[0] instanceof EE_Transaction))
50
+			throw new EE_Error(__('Incoming data for the Gateways data handler must have an EE_Transaction object as the value for the first array index.', 'event_espresso'));
51 51
 
52
-		if ( empty( $data[1] ) || ! $data[1] instanceof  EE_Payment  )
53
-			$pmt_obj = $this->_get_empty_payment_obj( $data[0] );
52
+		if (empty($data[1]) || ! $data[1] instanceof  EE_Payment)
53
+			$pmt_obj = $this->_get_empty_payment_obj($data[0]);
54 54
 
55
-		if ( ! empty( $data[2] ) ) {
55
+		if ( ! empty($data[2])) {
56 56
 			$filtered_reg_status = $data[2];
57 57
 		}
58 58
 
59 59
 		$data = array(
60 60
 			'txn_obj' => $data[0],
61 61
 			'pmt_obj' => isset($pmt_obj) ? $pmt_obj : $data[1],
62
-			'filtered_reg_status' => isset( $filtered_reg_status ) ? $filtered_reg_status : null
62
+			'filtered_reg_status' => isset($filtered_reg_status) ? $filtered_reg_status : null
63 63
 			);
64
-		parent::__construct( $data );
64
+		parent::__construct($data);
65 65
 	}
66 66
 
67 67
 
@@ -75,18 +75,18 @@  discard block
 block discarded – undo
75 75
 	 *
76 76
 	 * @return array   The prepped data for db
77 77
 	 */
78
-	static public function convert_data_for_persistent_storage( $data ) {
78
+	static public function convert_data_for_persistent_storage($data) {
79 79
 		$prepped_data = array();
80 80
 
81
-		if ( $data[0] instanceof EE_Transaction ) {
81
+		if ($data[0] instanceof EE_Transaction) {
82 82
 			$prepped_data['Transaction'] = $data[0]->ID();
83 83
 		}
84 84
 
85
-		if ( isset( $data[1] ) && $data[1] instanceof EE_Payment ) {
85
+		if (isset($data[1]) && $data[1] instanceof EE_Payment) {
86 86
 			$prepped_data['Payment'] = $data[1]->ID();
87 87
 		}
88 88
 
89
-		if ( ! empty( $data[2] ) ) {
89
+		if ( ! empty($data[2])) {
90 90
 			$prepped_data['filter'] = $data[2];
91 91
 		}
92 92
 
@@ -106,11 +106,11 @@  discard block
 block discarded – undo
106 106
 	 *
107 107
 	 * @return array
108 108
 	 */
109
-	static public function convert_data_from_persistent_storage( $data ) {
109
+	static public function convert_data_from_persistent_storage($data) {
110 110
 		$prepped_data = array(
111
-			0 => isset( $data['Transaction'] ) ? EEM_Transaction::instance()->get_one_by_ID( $data['Transaction'] ) : null,
112
-			1 => isset( $data['Payment'] ) ? EEM_Payment::instance()->get_one_by_ID( $data['Payment'] ) : null,
113
-			2 => isset( $data['filter'] ) ? $data['filter'] : null
111
+			0 => isset($data['Transaction']) ? EEM_Transaction::instance()->get_one_by_ID($data['Transaction']) : null,
112
+			1 => isset($data['Payment']) ? EEM_Payment::instance()->get_one_by_ID($data['Payment']) : null,
113
+			2 => isset($data['filter']) ? $data['filter'] : null
114 114
 		);
115 115
 		return $prepped_data;
116 116
 	}
@@ -121,8 +121,8 @@  discard block
 block discarded – undo
121 121
 	 * @param \EE_Transaction $txn
122 122
 	 * @return \EE_Payment
123 123
 	 */
124
-	private function _get_empty_payment_obj( EE_Transaction $txn ) {
125
-		$PMT = EE_Payment::new_instance( array(
124
+	private function _get_empty_payment_obj(EE_Transaction $txn) {
125
+		$PMT = EE_Payment::new_instance(array(
126 126
 			'STS_ID' => EEM_Payment::status_id_pending,
127 127
 			'PAY_timestamp' => time(),
128 128
 			'PMD_ID' => $txn->payment_method_ID(),
@@ -150,9 +150,9 @@  discard block
 block discarded – undo
150 150
 
151 151
 
152 152
 		//other data from the session (if possible)
153
-		$this->user_id = isset( $session_data['user_id'] ) ? $session_data['user_id'] : '';
154
-		$this->ip_address = isset( $session_data['ip_address'] ) ? $session_data['ip_address'] : '';
155
-		$this->user_agent = isset( $session_data['user_agent'] ) ? $session_data['user_agent'] : '';
153
+		$this->user_id = isset($session_data['user_id']) ? $session_data['user_id'] : '';
154
+		$this->ip_address = isset($session_data['ip_address']) ? $session_data['ip_address'] : '';
155
+		$this->user_agent = isset($session_data['user_agent']) ? $session_data['user_agent'] : '';
156 156
 		$this->init_access = $this->last_access = '';
157 157
 
158 158
 		$this->reg_objs = $this->txn->get_many_related('Registration');
Please login to merge, or discard this patch.
libraries/messages/defaults/EE_Messages_Template_Pack_Default.class.php 2 patches
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -21,8 +21,8 @@  discard block
 block discarded – undo
21 21
 		$this->label = __('Default', 'event_espresso');
22 22
 		$this->dbref = 'default';
23 23
 		$this->description = __('This is the default template pack included with Event Espress core messages system.', 'event_espresso');
24
-		$this->_base_url = EE_PLUGIN_DIR_URL . 'core/libraries/messages/defaults/default/';
25
-		$this->_base_path = EE_LIBRARIES . 'messages/defaults/default/';
24
+		$this->_base_url = EE_PLUGIN_DIR_URL.'core/libraries/messages/defaults/default/';
25
+		$this->_base_path = EE_LIBRARIES.'messages/defaults/default/';
26 26
 		$this->_supports = array(
27 27
 			'email' => array(
28 28
 				'cancelled_registration', 'declined_registration', 'not_approved_registration', 'pending_approval', 'registration',
@@ -33,9 +33,9 @@  discard block
 block discarded – undo
33 33
 				'receipt', 'invoice'
34 34
 				)
35 35
 			);
36
-		$this->_default_variation_labels= array(
37
-			'email' => __('Default', 'event_espresso' ),
38
-			'html' =>  __('Simple', 'event_espresso' )
36
+		$this->_default_variation_labels = array(
37
+			'email' => __('Default', 'event_espresso'),
38
+			'html' =>  __('Simple', 'event_espresso')
39 39
 			 );
40 40
 		$this->_variations = array(
41 41
 			'html' => array(
@@ -63,18 +63,18 @@  discard block
 block discarded – undo
63 63
 
64 64
 
65 65
 
66
-	public function get_default_variation( $messenger, $message_type, $type, $url, $file_extension ) {
66
+	public function get_default_variation($messenger, $message_type, $type, $url, $file_extension) {
67 67
 		$base = $url ? $this->_base_url : $this->_base_path;
68 68
 		$base_path = $this->_base_path;
69 69
 		//possible variation paths considering whether message type is present or not in the file name.
70
-		$path_string = 'variations/' . $messenger . '_' . $message_type . '_'  . $type . '_default' . $file_extension;
71
-		$default_path_string = 'variations/' . $messenger . '_' . $type . '_default' . $file_extension;
70
+		$path_string = 'variations/'.$messenger.'_'.$message_type.'_'.$type.'_default'.$file_extension;
71
+		$default_path_string = 'variations/'.$messenger.'_'.$type.'_default'.$file_extension;
72 72
 		//first see if fully validated file exists.
73
-		if ( is_readable( $base_path . $path_string ) ) {
74
-			$variation_path = $base . $path_string;
73
+		if (is_readable($base_path.$path_string)) {
74
+			$variation_path = $base.$path_string;
75 75
 		//otherwise see if default exists.
76
-		} elseif ( is_readable( $base_path . $default_path_string ) ) {
77
-			$variation_path = $base . $default_path_string;
76
+		} elseif (is_readable($base_path.$default_path_string)) {
77
+			$variation_path = $base.$default_path_string;
78 78
 		} else {
79 79
 			//no matches found so nothing is present.
80 80
 			$variation_path = '';
Please login to merge, or discard this patch.
Braces   +3 added lines, -1 removed lines patch added patch discarded remove patch
@@ -5,7 +5,9 @@
 block discarded – undo
5 5
  * @subpackage plugin api, messages
6 6
  * @since           4.5.0
7 7
  */
8
-if ( ! defined('EVENT_ESPRESSO_VERSION')) exit('No direct script access allowed');
8
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
9
+	exit('No direct script access allowed');
10
+}
9 11
 
10 12
 /**
11 13
  * Use this to register or deregister a new message template pack variation for the EE messages system.
Please login to merge, or discard this patch.
messages/defaults/default/email_cancelled_registration_content.template.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -31,9 +31,9 @@  discard block
 block discarded – undo
31 31
 						<tbody>
32 32
 							<tr>
33 33
 								<td>
34
-									<h2><?php printf( __( 'Hello, %s', 'event_espresso' ), '[RECIPIENT_FNAME]' ); ?>:</h2>
34
+									<h2><?php printf(__('Hello, %s', 'event_espresso'), '[RECIPIENT_FNAME]'); ?>:</h2>
35 35
 
36
-									<p class="lead"><?php _e( 'Your registration was cancelled for the following tickets:', 'event_espresso' ); ?></p>
36
+									<p class="lead"><?php _e('Your registration was cancelled for the following tickets:', 'event_espresso'); ?></p>
37 37
 								</td>
38 38
 							</tr>
39 39
 						</tbody>
@@ -62,10 +62,10 @@  discard block
 block discarded – undo
62 62
 									<tbody>
63 63
 										<tr>
64 64
 											<td>
65
-												<h5><?php _e( 'Connect with Us:', 'event_espresso' ); ?></h5>
66
-												<a class="soc-btn fb" href="[CO_FACEBOOK_URL]"><?php _e( 'Facebook', 'event_espresso' ); ?></a>
67
-												<a class="soc-btn tw" href="[CO_TWITTER_URL]"><?php _e( 'Twitter', 'event_espresso' ); ?></a>
68
-												<a class="soc-btn gp" href="[CO_GOOGLE_URL]"><?php _e( 'Google+', 'event_espresso' ); ?></a>
65
+												<h5><?php _e('Connect with Us:', 'event_espresso'); ?></h5>
66
+												<a class="soc-btn fb" href="[CO_FACEBOOK_URL]"><?php _e('Facebook', 'event_espresso'); ?></a>
67
+												<a class="soc-btn tw" href="[CO_TWITTER_URL]"><?php _e('Twitter', 'event_espresso'); ?></a>
68
+												<a class="soc-btn gp" href="[CO_GOOGLE_URL]"><?php _e('Google+', 'event_espresso'); ?></a>
69 69
 											</td>
70 70
 										</tr>
71 71
 									</tbody>
@@ -75,9 +75,9 @@  discard block
 block discarded – undo
75 75
 									<tbody>
76 76
 										<tr>
77 77
 											<td>
78
-												<h5><?php _e( 'Contact Info:', 'event_espresso' ); ?></h5>
79
-												<?php _e( 'Phone:', 'event_espresso' ); ?> <strong>[CO_PHONE]</strong>
80
-												<?php _e( 'Email:', 'event_espresso' ); ?>
78
+												<h5><?php _e('Contact Info:', 'event_espresso'); ?></h5>
79
+												<?php _e('Phone:', 'event_espresso'); ?> <strong>[CO_PHONE]</strong>
80
+												<?php _e('Email:', 'event_espresso'); ?>
81 81
 												<strong><a href="mailto:[CO_EMAIL]" target="_blank">[CO_EMAIL]</a></strong>
82 82
 											</td>
83 83
 										</tr>
Please login to merge, or discard this patch.
defaults/default/email_cancelled_registration_content_admin.template.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -31,9 +31,9 @@  discard block
 block discarded – undo
31 31
 						<tbody>
32 32
 							<tr>
33 33
 								<td>
34
-									<h2><?php printf( __( 'Hello, %s:', 'event_espresso' ), '[EVENT_AUTHOR_FNAME]' ); ?></h2>
34
+									<h2><?php printf(__('Hello, %s:', 'event_espresso'), '[EVENT_AUTHOR_FNAME]'); ?></h2>
35 35
 
36
-									<p class="lead"><?php _e( 'Registrations were cancelled for the following events.', 'event_espresso' ); ?></p>
36
+									<p class="lead"><?php _e('Registrations were cancelled for the following events.', 'event_espresso'); ?></p>
37 37
 								</td>
38 38
 							</tr>
39 39
 						</tbody>
@@ -59,10 +59,10 @@  discard block
 block discarded – undo
59 59
 									<tbody>
60 60
 										<tr>
61 61
 											<td>
62
-												<h5><?php _e( 'Connect with Us:', 'event_espresso' ); ?></h5>
63
-												<a class="soc-btn fb" href="[CO_FACEBOOK_URL]"><?php _e( 'Facebook', 'event_espresso' ); ?></a>
64
-												<a class="soc-btn tw" href="[CO_TWITTER_URL]"><?php _e( 'Twitter', 'event_espresso' ); ?></a>
65
-												<a class="soc-btn gp" href="[CO_GOOGLE_URL]"><?php _e( 'Google+', 'event_espresso' ); ?></a>
62
+												<h5><?php _e('Connect with Us:', 'event_espresso'); ?></h5>
63
+												<a class="soc-btn fb" href="[CO_FACEBOOK_URL]"><?php _e('Facebook', 'event_espresso'); ?></a>
64
+												<a class="soc-btn tw" href="[CO_TWITTER_URL]"><?php _e('Twitter', 'event_espresso'); ?></a>
65
+												<a class="soc-btn gp" href="[CO_GOOGLE_URL]"><?php _e('Google+', 'event_espresso'); ?></a>
66 66
 											</td>
67 67
 										</tr>
68 68
 									</tbody>
@@ -72,9 +72,9 @@  discard block
 block discarded – undo
72 72
 									<tbody>
73 73
 										<tr>
74 74
 											<td>
75
-												<h5><?php _e( 'Contact Info:', 'event_espresso' ); ?></h5>
76
-												<?php _e( 'Phone:', 'event_espresso' ); ?> <strong>[CO_PHONE]</strong>
77
-												<?php _e( 'Email:', 'event_espresso' ); ?>
75
+												<h5><?php _e('Contact Info:', 'event_espresso'); ?></h5>
76
+												<?php _e('Phone:', 'event_espresso'); ?> <strong>[CO_PHONE]</strong>
77
+												<?php _e('Email:', 'event_espresso'); ?>
78 78
 												<strong><a href="mailto:[CO_EMAIL]" target="_blank">[CO_EMAIL]</a></strong>
79 79
 											</td>
80 80
 										</tr>
Please login to merge, or discard this patch.
messages/defaults/default/email_declined_registration_content.template.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -31,8 +31,8 @@  discard block
 block discarded – undo
31 31
 						<tbody>
32 32
 							<tr>
33 33
 								<td>
34
-									<h2><?php printf( __( 'Hello, %s:', 'event_espresso' ), '[RECIPIENT_FNAME]' ); ?></h2>
35
-									<p class="lead"><?php _e( 'Your registration was declined for the following tickets:', 'event_espresso' ); ?></p>
34
+									<h2><?php printf(__('Hello, %s:', 'event_espresso'), '[RECIPIENT_FNAME]'); ?></h2>
35
+									<p class="lead"><?php _e('Your registration was declined for the following tickets:', 'event_espresso'); ?></p>
36 36
 								</td>
37 37
 							</tr>
38 38
 						</tbody>
@@ -61,10 +61,10 @@  discard block
 block discarded – undo
61 61
 									<tbody>
62 62
 										<tr>
63 63
 											<td>
64
-												<h5><?php _e( 'Connect with Us:', 'event_espresso' ); ?></h5>
65
-												<a class="soc-btn fb" href="[CO_FACEBOOK_URL]"><?php _e( 'Facebook', 'event_espresso' ); ?></a>
66
-												<a class="soc-btn tw" href="[CO_TWITTER_URL]"><?php _e( 'Twitter', 'event_espresso' ); ?></a>
67
-												<a class="soc-btn gp" href="[CO_GOOGLE_URL]"><?php _e( 'Google+', 'event_espresso' ); ?></a>
64
+												<h5><?php _e('Connect with Us:', 'event_espresso'); ?></h5>
65
+												<a class="soc-btn fb" href="[CO_FACEBOOK_URL]"><?php _e('Facebook', 'event_espresso'); ?></a>
66
+												<a class="soc-btn tw" href="[CO_TWITTER_URL]"><?php _e('Twitter', 'event_espresso'); ?></a>
67
+												<a class="soc-btn gp" href="[CO_GOOGLE_URL]"><?php _e('Google+', 'event_espresso'); ?></a>
68 68
 											</td>
69 69
 										</tr>
70 70
 									</tbody>
@@ -74,9 +74,9 @@  discard block
 block discarded – undo
74 74
 									<tbody>
75 75
 										<tr>
76 76
 											<td>
77
-												<h5><?php _e( 'Contact Info:', 'event_espresso' ); ?></h5>
78
-												<?php _e( 'Phone:', 'event_espresso' ); ?> <strong>[CO_PHONE]</strong>
79
-												<?php _e( 'Email:', 'event_espresso' ); ?>
77
+												<h5><?php _e('Contact Info:', 'event_espresso'); ?></h5>
78
+												<?php _e('Phone:', 'event_espresso'); ?> <strong>[CO_PHONE]</strong>
79
+												<?php _e('Email:', 'event_espresso'); ?>
80 80
 												<strong><a href="mailto:[CO_EMAIL]" target="_blank">[CO_EMAIL]</a></strong>
81 81
 											</td>
82 82
 										</tr>
Please login to merge, or discard this patch.
defaults/default/email_declined_registration_content_admin.template.php 1 patch
Spacing   +9 added lines, -9 removed lines patch added patch discarded remove patch
@@ -31,8 +31,8 @@  discard block
 block discarded – undo
31 31
 						<tbody>
32 32
 							<tr>
33 33
 								<td>
34
-									<h2><?php printf( __( 'Hello, %s:', 'event_espresso' ), '[EVENT_AUTHOR_FNAME]' ); ?></h2>
35
-									<p class="lead"><?php _e( 'Registrations were declined for the following events:', 'event_espresso' ); ?></p>
34
+									<h2><?php printf(__('Hello, %s:', 'event_espresso'), '[EVENT_AUTHOR_FNAME]'); ?></h2>
35
+									<p class="lead"><?php _e('Registrations were declined for the following events:', 'event_espresso'); ?></p>
36 36
 								</td>
37 37
 							</tr>
38 38
 						</tbody>
@@ -58,10 +58,10 @@  discard block
 block discarded – undo
58 58
 									<tbody>
59 59
 										<tr>
60 60
 											<td>
61
-												<h5><?php _e( 'Connect with Us:', 'event_espresso' ); ?></h5>
62
-												<a class="soc-btn fb" href="[CO_FACEBOOK_URL]"><?php _e( 'Facebook', 'event_espresso' ); ?></a>
63
-												<a class="soc-btn tw" href="[CO_TWITTER_URL]"><?php _e( 'Twitter', 'event_espresso' ); ?></a>
64
-												<a class="soc-btn gp" href="[CO_GOOGLE_URL]"><?php _e( 'Google+', 'event_espresso' ); ?></a>
61
+												<h5><?php _e('Connect with Us:', 'event_espresso'); ?></h5>
62
+												<a class="soc-btn fb" href="[CO_FACEBOOK_URL]"><?php _e('Facebook', 'event_espresso'); ?></a>
63
+												<a class="soc-btn tw" href="[CO_TWITTER_URL]"><?php _e('Twitter', 'event_espresso'); ?></a>
64
+												<a class="soc-btn gp" href="[CO_GOOGLE_URL]"><?php _e('Google+', 'event_espresso'); ?></a>
65 65
 											</td>
66 66
 										</tr>
67 67
 									</tbody>
@@ -71,9 +71,9 @@  discard block
 block discarded – undo
71 71
 									<tbody>
72 72
 										<tr>
73 73
 											<td>
74
-												<h5><?php _e( 'Contact Info:', 'event_espresso' ); ?></h5>
75
-												<?php _e( 'Phone:', 'event_espresso' ); ?> <strong>[CO_PHONE]</strong>
76
-												<?php _e( 'Email:', 'event_espresso' ); ?>
74
+												<h5><?php _e('Contact Info:', 'event_espresso'); ?></h5>
75
+												<?php _e('Phone:', 'event_espresso'); ?> <strong>[CO_PHONE]</strong>
76
+												<?php _e('Email:', 'event_espresso'); ?>
77 77
 												<strong><a href="mailto:[CO_EMAIL]" target="_blank">[CO_EMAIL]</a></strong>
78 78
 											</td>
79 79
 										</tr>
Please login to merge, or discard this patch.
messages/defaults/default/email_declined_registration_subject.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,1 +1,1 @@
 block discarded – undo
1
-<?php _e('Declined Registration Details', 'event_espresso');?>
2 1
\ No newline at end of file
2
+<?php _e('Declined Registration Details', 'event_espresso'); ?>
3 3
\ No newline at end of file
Please login to merge, or discard this patch.
defaults/default/email_not_approved_registration_attendee_list.template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@
 block discarded – undo
1 1
 <h5>[FNAME] [LNAME]</h5>
2 2
 <ul>
3
-	<li><strong><?php _e( 'Registration Code:', 'event_espresso' ); ?></strong> [REGISTRATION_CODE]</li>
4
-	<li><strong><?php _e( 'Tickets:', 'event_espresso' ); ?></strong></li>
3
+	<li><strong><?php _e('Registration Code:', 'event_espresso'); ?></strong> [REGISTRATION_CODE]</li>
4
+	<li><strong><?php _e('Tickets:', 'event_espresso'); ?></strong></li>
5 5
 </ul>
6 6
 <ul>
7 7
 	<li>[TICKET_LIST]</li>
Please login to merge, or discard this patch.