Completed
Branch BUG/11214/move-command-handler... (de017e)
by
unknown
05:27 queued 03:19
created
data_migration_scripts/4_1_0_stages/EE_DMS_4_1_0_questions.dmsstage.php 1 patch
Spacing   +32 added lines, -32 removed lines patch added patch discarded remove patch
@@ -55,21 +55,21 @@  discard block
 block discarded – undo
55 55
 					'QSO_deleted'=>new EE_Trashed_Flag_Field('QSO_deleted', __('Flag indicating Option was trashed','event_espresso'), false, false)
56 56
 				)
57 57
  */
58
-class EE_DMS_4_1_0_questions extends EE_Data_Migration_Script_Stage{
58
+class EE_DMS_4_1_0_questions extends EE_Data_Migration_Script_Stage {
59 59
 	private $_old_table;
60 60
 	private $_new_table;
61 61
 	private $_option_table;
62
-	function _migration_step($num_items=50){
62
+	function _migration_step($num_items = 50) {
63 63
 		global $wpdb;
64 64
 		$start_at_record = $this->count_records_migrated();
65
-		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d",$start_at_record,$num_items),ARRAY_A);
65
+		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
66 66
 		$items_actually_migrated = 0;
67
-		foreach($rows as $question_row){
67
+		foreach ($rows as $question_row) {
68 68
 			$new_id = $this->_insert_new_question($question_row);
69 69
 			$this->get_migration_script()->set_mapping($this->_old_table, $question_row['id'], $this->_new_table, $new_id);
70 70
 			$items_actually_migrated++;
71 71
 		}
72
-		if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
72
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
73 73
 			$this->set_completed();
74 74
 		}
75 75
 		return $items_actually_migrated;
@@ -87,14 +87,14 @@  discard block
 block discarded – undo
87 87
 		$this->_option_table = $wpdb->prefix."esp_question_option";
88 88
 		parent::__construct();
89 89
 	}
90
-	private function _insert_new_question($old_question){
90
+	private function _insert_new_question($old_question) {
91 91
 		global $wpdb;
92 92
 		//if this pretends to be a 'system' question, check if we already have a
93 93
 		//system question for that string. If so, pretend THAT new question
94 94
 		//is what we just isnerted
95
-		if($old_question['system_name']){
96
-			$id_of_new_system_question = intval($wpdb->get_var($wpdb->prepare("SELECT QST_ID FROM {$this->_new_table} WHERE QST_system = %s",$old_question['system_name'])));
97
-			if($id_of_new_system_question){
95
+		if ($old_question['system_name']) {
96
+			$id_of_new_system_question = intval($wpdb->get_var($wpdb->prepare("SELECT QST_ID FROM {$this->_new_table} WHERE QST_system = %s", $old_question['system_name'])));
97
+			if ($id_of_new_system_question) {
98 98
 				return $id_of_new_system_question;
99 99
 			}
100 100
 			//ok so this must be the first one. Carry on.
@@ -113,27 +113,27 @@  discard block
 block discarded – undo
113 113
 			'QST_deleted'=>false
114 114
 		);
115 115
 		$datatypes = array(
116
-			'%s',//QST_display_text
117
-			'%s',//QST-admin_label
118
-			'%s',//QST_system
119
-			'%s',//QST_type
120
-			'%d',//QST_required
121
-			'%s',//QST_required_text
122
-			'%d',//QST_order
123
-			'%d',//QST_admin_only
124
-			'%d',//QST_wp_user
125
-			'%d',//QST_deleted
116
+			'%s', //QST_display_text
117
+			'%s', //QST-admin_label
118
+			'%s', //QST_system
119
+			'%s', //QST_type
120
+			'%d', //QST_required
121
+			'%s', //QST_required_text
122
+			'%d', //QST_order
123
+			'%d', //QST_admin_only
124
+			'%d', //QST_wp_user
125
+			'%d', //QST_deleted
126 126
 		);
127
-		$success = $wpdb->insert($this->_new_table,$cols_n_values,$datatypes);
128
-		if ( ! $success){
127
+		$success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
128
+		if ( ! $success) {
129 129
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_question, $this->_new_table, $cols_n_values, $datatypes));
130 130
 			return 0;
131 131
 		}
132 132
 		$new_id = $wpdb->insert_id;
133 133
 		//now take care of posisbly adding question options
134
-		if(in_array($old_question['question_type'],array('DROPDOWN','SINGLE','MULTIPLE'))){
135
-			$options = explode(",",$old_question['response']);
136
-			foreach($options as $option){
134
+		if (in_array($old_question['question_type'], array('DROPDOWN', 'SINGLE', 'MULTIPLE'))) {
135
+			$options = explode(",", $old_question['response']);
136
+			foreach ($options as $option) {
137 137
 				$this->_insert_question_option($option, $new_id);
138 138
 			}
139 139
 		}
@@ -146,7 +146,7 @@  discard block
 block discarded – undo
146 146
 	 * @param int $question_id
147 147
 	 * @return int
148 148
 	 */
149
-	private function _insert_question_option($option,$question_id){
149
+	private function _insert_question_option($option, $question_id) {
150 150
 		$option = trim($option);
151 151
 		global $wpdb;
152 152
 		$cols_n_values = array(
@@ -154,14 +154,14 @@  discard block
 block discarded – undo
154 154
 			'QSO_value'=>$option,
155 155
 			'QSO_deleted'=>false
156 156
 		);
157
-		$datatypes= array(
158
-			'%d',//QST_ID
159
-			'%s',//QSO_value
160
-			'%d',//QSO_deleted
157
+		$datatypes = array(
158
+			'%d', //QST_ID
159
+			'%s', //QSO_value
160
+			'%d', //QSO_deleted
161 161
 		);
162
-		$success = $wpdb->insert($this->_option_table,$cols_n_values,$datatypes);
163
-		if ( ! $success ){
164
-			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('option'=>$option,'new_question_id'=>$question_id), $this->_option_table, $cols_n_values, $datatypes));
162
+		$success = $wpdb->insert($this->_option_table, $cols_n_values, $datatypes);
163
+		if ( ! $success) {
164
+			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, array('option'=>$option, 'new_question_id'=>$question_id), $this->_option_table, $cols_n_values, $datatypes));
165 165
 			return 0;
166 166
 		}
167 167
 		return $wpdb->insert_id;
Please login to merge, or discard this patch.
4_8_0_stages/EE_DMS_4_8_0_event_subtotals.dmsstage.php 1 patch
Spacing   +41 added lines, -41 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
3
-	exit( 'No direct script access allowed' );
2
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
3
+	exit('No direct script access allowed');
4 4
 }
5 5
 
6 6
 /**
@@ -12,68 +12,68 @@  discard block
 block discarded – undo
12 12
  * @author				Mike Nelson
13 13
  *
14 14
  */
15
-class EE_DMS_4_8_0_event_subtotals extends EE_Data_Migration_Script_Stage_Table{
16
-	function __construct(){
15
+class EE_DMS_4_8_0_event_subtotals extends EE_Data_Migration_Script_Stage_Table {
16
+	function __construct() {
17 17
 		global $wpdb;
18
-		$this->_old_table = $wpdb->prefix . 'esp_line_item';
18
+		$this->_old_table = $wpdb->prefix.'esp_line_item';
19 19
 		$this->_extra_where_sql = ' WHERE LIN_type="sub-total" AND LIN_code="pre-tax-subtotal"';
20 20
 		$this->_pretty_name = __('Event Sub-total line items', 'event_espresso');
21 21
 		parent::__construct();
22 22
 	}
23
-	protected function _migrate_old_row( $line_item_row ) {
23
+	protected function _migrate_old_row($line_item_row) {
24 24
 		global $wpdb;
25 25
 		//what event is this line item for? this can be found by looking at its transaction's registration's EVT_ID
26
-		$event_id = $wpdb->get_var( $wpdb->prepare( 'SELECT EVT_ID FROM ' . $wpdb->prefix . 'esp_registration WHERE TXN_ID=%d LIMIT 1', $line_item_row[ 'TXN_ID' ] ) );
26
+		$event_id = $wpdb->get_var($wpdb->prepare('SELECT EVT_ID FROM '.$wpdb->prefix.'esp_registration WHERE TXN_ID=%d LIMIT 1', $line_item_row['TXN_ID']));
27 27
 		$new_line_item_data = array(
28
-					'LIN_code' => 'event-' . $event_id,
29
-					'TXN_ID' => $line_item_row[ 'TXN_ID' ],
30
-					'LIN_name' => __( 'Event', 'event_espresso' ),
31
-					'LIN_desc' => $line_item_row[ 'LIN_desc' ],
32
-					'LIN_unit_price' => $line_item_row[ 'LIN_unit_price' ],
33
-					'LIN_percent' => $line_item_row[ 'LIN_percent' ],
34
-					'LIN_is_taxable' => $line_item_row[ 'LIN_is_taxable' ],
35
-					'LIN_order' => $line_item_row[ 'LIN_order' ],
36
-					'LIN_total' => $line_item_row[ 'LIN_total' ],
37
-					'LIN_quantity' => $line_item_row[ 'LIN_quantity' ],
38
-					'LIN_parent' => $line_item_row[ 'LIN_ID'],
28
+					'LIN_code' => 'event-'.$event_id,
29
+					'TXN_ID' => $line_item_row['TXN_ID'],
30
+					'LIN_name' => __('Event', 'event_espresso'),
31
+					'LIN_desc' => $line_item_row['LIN_desc'],
32
+					'LIN_unit_price' => $line_item_row['LIN_unit_price'],
33
+					'LIN_percent' => $line_item_row['LIN_percent'],
34
+					'LIN_is_taxable' => $line_item_row['LIN_is_taxable'],
35
+					'LIN_order' => $line_item_row['LIN_order'],
36
+					'LIN_total' => $line_item_row['LIN_total'],
37
+					'LIN_quantity' => $line_item_row['LIN_quantity'],
38
+					'LIN_parent' => $line_item_row['LIN_ID'],
39 39
 					'LIN_type' => 'sub-total',
40 40
 					'OBJ_type' => 'Event',
41 41
 					'OBJ_ID' => $event_id,
42 42
 				);
43 43
 		$new_line_item_datatypes = array(
44
-					'%s',//LIN_code
45
-					'%d',//TXN_ID
46
-					'%s',//LIN_name
47
-					'%s',//LIN_desc
48
-					'%f',//LIN_unit_price
49
-					'%f',//LIN_percent
50
-					'%d',//LIN_is_taxable
51
-					'%d',//LIN_order
52
-					'%f',//LIN_total
53
-					'%d',//LIN_quantity
54
-					'%d',//LIN_parent
55
-					'%s',//LIN_type
56
-					'%s',//OBJ_type
57
-					'%d',//OBJ_ID
44
+					'%s', //LIN_code
45
+					'%d', //TXN_ID
46
+					'%s', //LIN_name
47
+					'%s', //LIN_desc
48
+					'%f', //LIN_unit_price
49
+					'%f', //LIN_percent
50
+					'%d', //LIN_is_taxable
51
+					'%d', //LIN_order
52
+					'%f', //LIN_total
53
+					'%d', //LIN_quantity
54
+					'%d', //LIN_parent
55
+					'%s', //LIN_type
56
+					'%s', //OBJ_type
57
+					'%d', //OBJ_ID
58 58
 				);
59 59
 		//insert the new event subtotal line item, pointing to this line item
60
-		$success = $wpdb->insert( $this->_old_table, $new_line_item_data, $new_line_item_datatypes );
61
-		if( ! $success ) {
62
-			$this->add_error( $this->_create_error_message_for_db_insertion( $this->_old_table, $line_item_row, $this->_old_table, $new_line_item_data, $new_line_item_datatypes ) );
60
+		$success = $wpdb->insert($this->_old_table, $new_line_item_data, $new_line_item_datatypes);
61
+		if ( ! $success) {
62
+			$this->add_error($this->_create_error_message_for_db_insertion($this->_old_table, $line_item_row, $this->_old_table, $new_line_item_data, $new_line_item_datatypes));
63 63
 		}
64 64
 		$new_line_item_id = $wpdb->insert_id;
65
-		$this->get_migration_script()->set_mapping($this->_old_table, $line_item_row[ 'LIN_ID' ], $this->_old_table, $new_line_item_id );
65
+		$this->get_migration_script()->set_mapping($this->_old_table, $line_item_row['LIN_ID'], $this->_old_table, $new_line_item_id);
66 66
 		$query = $wpdb->prepare(
67 67
 					"UPDATE {$this->_old_table} SET LIN_parent=%d WHERE LIN_parent = %d AND LIN_ID != %d LIMIT 100",
68 68
 					$new_line_item_id,
69
-					$line_item_row[ 'LIN_ID' ],
69
+					$line_item_row['LIN_ID'],
70 70
 					$new_line_item_id );
71
-		$success = $wpdb->query( $query );
72
-		if( $success === false ) {
71
+		$success = $wpdb->query($query);
72
+		if ($success === false) {
73 73
 			$this->add_error(
74
-					sprintf( __( 'Error updating rows to new event subtotal %1$s from %2$s. Error was: %3$s, while using query %4$s which had a result of %5$s', 'event_espresso' ),
74
+					sprintf(__('Error updating rows to new event subtotal %1$s from %2$s. Error was: %3$s, while using query %4$s which had a result of %5$s', 'event_espresso'),
75 75
 					$new_line_item_id,
76
-					$line_item_row[ 'LIN_ID' ],
76
+					$line_item_row['LIN_ID'],
77 77
 					$wpdb->last_error,
78 78
 					$query,
79 79
 					$success) );
Please login to merge, or discard this patch.
core/interfaces/EEI_Query_Filter.interface.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
3
-	exit( 'No direct script access allowed' );
2
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
3
+	exit('No direct script access allowed');
4 4
 }
5 5
 
6 6
 /**
@@ -12,7 +12,7 @@  discard block
 block discarded – undo
12 12
  * @since      4.9.0
13 13
  * @author     Darren Ethier
14 14
  */
15
-interface EEI_Query_Filter  {
15
+interface EEI_Query_Filter {
16 16
 
17 17
 
18 18
 	/**
Please login to merge, or discard this patch.
core/libraries/line_item_filters/EE_Line_Item_Filter_Base.class.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
3
-	exit( 'No direct script access allowed' );
2
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
3
+	exit('No direct script access allowed');
4 4
 }
5 5
 /**
6 6
  * Class EE_Line_Item_Filter_Base
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 	 * @param \EEI_Line_Item $line_item
25 25
 	 * @return \EEI_Line_Item
26 26
 	 */
27
-	public function process( EEI_Line_Item $line_item ) {
27
+	public function process(EEI_Line_Item $line_item) {
28 28
 		return $line_item;
29 29
 	}
30 30
 
Please login to merge, or discard this patch.
public/Espresso_Arabica_2014/content-espresso_venues-details.php 1 patch
Spacing   +13 added lines, -13 removed lines patch added patch discarded remove patch
@@ -1,43 +1,43 @@
 block discarded – undo
1 1
 <?php //echo '<h1>' . __FILE__ . '</h1>'; ?>
2 2
 <?php global $post; ?>
3 3
 <div class="venue-content">
4
-<?php if ( apply_filters( 'FHEE__content_espresso_venues_details_template__display_entry_meta', TRUE )): ?>
4
+<?php if (apply_filters('FHEE__content_espresso_venues_details_template__display_entry_meta', TRUE)): ?>
5 5
 	<div class="entry-meta">
6
-		<span class="tags-links"><?php espresso_venue_categories( $post->ID, TRUE, TRUE ); ?></span>
6
+		<span class="tags-links"><?php espresso_venue_categories($post->ID, TRUE, TRUE); ?></span>
7 7
 		<?php
8
-			if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) :
8
+			if ( ! post_password_required() && (comments_open() || get_comments_number())) :
9 9
 		?>
10
-		<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'event_espresso' ), __( '1 Comment', 'event_espresso' ), __( '% Comments', 'event_espresso' ) ); ?></span>
10
+		<span class="comments-link"><?php comments_popup_link(__('Leave a comment', 'event_espresso'), __('1 Comment', 'event_espresso'), __('% Comments', 'event_espresso')); ?></span>
11 11
 		<?php
12 12
 			endif;
13 13
 
14
-			edit_post_link( __( 'Edit', 'event_espresso' ), '<span class="edit-link">', '</span>' );
14
+			edit_post_link(__('Edit', 'event_espresso'), '<span class="edit-link">', '</span>');
15 15
 		?>
16 16
 	</div>
17 17
 <?php  endif; ?>
18 18
 	
19 19
 	<h3 class="event-venues-h3 ee-event-h3">
20
-		<?php _e( 'Details', 'event_espresso' ); ?>
20
+		<?php _e('Details', 'event_espresso'); ?>
21 21
 	</h3>
22 22
 
23
-	<?php if ( $venue_phone = espresso_venue_phone( $post->ID, FALSE )) : ?>
23
+	<?php if ($venue_phone = espresso_venue_phone($post->ID, FALSE)) : ?>
24 24
 	<p>
25
-		<span class="small-text"><strong><?php _e( 'Venue Phone:', 'event_espresso' ); ?> </strong></span><?php echo $venue_phone; ?>
25
+		<span class="small-text"><strong><?php _e('Venue Phone:', 'event_espresso'); ?> </strong></span><?php echo $venue_phone; ?>
26 26
 	</p>
27 27
 	<?php endif; ?>
28
-	<?php if ( $venue_website = espresso_venue_website( $post->ID, FALSE )) : ?>
28
+	<?php if ($venue_website = espresso_venue_website($post->ID, FALSE)) : ?>
29 29
 	<p>
30
-		<span class="small-text"><strong><?php _e( 'Venue Website:', 'event_espresso' ); ?> </strong></span><?php echo $venue_website; ?>
30
+		<span class="small-text"><strong><?php _e('Venue Website:', 'event_espresso'); ?> </strong></span><?php echo $venue_website; ?>
31 31
 	</p>
32 32
 	<?php endif; ?>
33 33
 	<?php 
34
-	do_action( 'AHEE__content_espresso_venues_details_template__before_the_content', $post ); 
35
-	if ( is_archive() && has_excerpt( $post->ID )) {
34
+	do_action('AHEE__content_espresso_venues_details_template__before_the_content', $post); 
35
+	if (is_archive() && has_excerpt($post->ID)) {
36 36
 		the_excerpt();
37 37
 	} else {
38 38
 		the_content();
39 39
 	}
40
-	do_action( 'AHEE__content_espresso_venues_details_template__after_the_content', $post ); 
40
+	do_action('AHEE__content_espresso_venues_details_template__after_the_content', $post); 
41 41
 	?>
42 42
 </div>
43 43
 <!-- .venue-content -->
Please login to merge, or discard this patch.
admin_pages/events/help_tabs/event_editor_venue_details.help_tab.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -3,5 +3,5 @@
 block discarded – undo
3 3
 <?php _e('A venue is the place or location that is hosting your event. This setting is optional which means that you are not required to select a venue for your event.', 'event_espresso'); ?>
4 4
 </p>
5 5
 <p>
6
-<?php echo sprintf(__('Venues can be managed through the %sVenues page%s.', 'event_espresso'),'<a href="admin.php?page=espresso_venues">','</a>'); ?>
6
+<?php echo sprintf(__('Venues can be managed through the %sVenues page%s.', 'event_espresso'), '<a href="admin.php?page=espresso_venues">', '</a>'); ?>
7 7
 </p>
8 8
\ No newline at end of file
Please login to merge, or discard this patch.
admin_pages/events/templates/event_tickets_metabox_main.template.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@  discard block
 block discarded – undo
1
-<?php do_action( 'AHEE__event_tickets_metabox_main__before_content' ); ?>
1
+<?php do_action('AHEE__event_tickets_metabox_main__before_content'); ?>
2 2
 <div id="event-and-ticket-form-content">
3 3
 	<h4 class="event-tickets-datetimes-title"><?php _e('Event Datetime', 'event_espresso'); ?></h4><?php echo $event_datetime_help_link; ?>
4 4
 	<div class="event-datetimes-container">
@@ -29,11 +29,11 @@  discard block
 block discarded – undo
29 29
 						</td>
30 30
 						<td class="event-datetime-column reg-limit-column">
31 31
 							<?php
32
-								$reg_limit = $time->get_pretty('DTT_reg_limit','input');
32
+								$reg_limit = $time->get_pretty('DTT_reg_limit', 'input');
33 33
 							?>
34 34
 							<input type="text" name="edit_event_datetimes[1][DTT_reg_limit]" id="event-datetime-DTT_reg_limit-1" class="ee-small-text-inp ee-inp-right event-datetime-DTT_reg_limit" value="<?php echo $reg_limit; ?>">
35 35
 						</td>
36
-						<td class="datetime-tickets-sold"><?php printf( __('Tickets Sold: %s', 'event_espresso'), $time->get('DTT_sold') ); ?></td>
36
+						<td class="datetime-tickets-sold"><?php printf(__('Tickets Sold: %s', 'event_espresso'), $time->get('DTT_sold')); ?></td>
37 37
 					</tr>
38 38
 				</tbody>
39 39
 			</table>
@@ -71,7 +71,7 @@  discard block
 block discarded – undo
71 71
 	<div style="clear:both"></div>
72 72
 </div> <!-- end #event-and-ticket-form-content -->
73 73
 
74
-<?php do_action( 'AHEE__event_tickets_metabox_main__after_content' ); ?>
74
+<?php do_action('AHEE__event_tickets_metabox_main__after_content'); ?>
75 75
 
76 76
 <table id="new-ticket-row-form" class="hidden">
77 77
 	<tbody><?php echo $ticket_js_structure; ?></tbody>
Please login to merge, or discard this patch.
general_settings/help_tabs/general_settings_critical_pages.help_tab.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -6,41 +6,41 @@
 block discarded – undo
6 6
 <ul>
7 7
 <li>
8 8
 <strong><?php _e('Registration Checkout Page', 'event_espresso'); ?></strong><br />
9
-<?php printf( __('This page displays all your events and is required. It is important that this page always contain the %s shortcode. It is not required to be in your navigation menu.', 'event_espresso'), '<strong>[ESPRESSO_CHECKOUT]</strong>' ); ?>
9
+<?php printf(__('This page displays all your events and is required. It is important that this page always contain the %s shortcode. It is not required to be in your navigation menu.', 'event_espresso'), '<strong>[ESPRESSO_CHECKOUT]</strong>'); ?>
10 10
 </li>
11 11
 <li>
12 12
 <strong><?php _e('Transactions Page', 'event_espresso'); ?></strong><br />
13
-<?php printf( __('This page processes the payments and is required. It should only contain the %s shortcode. No other content should be added and it should be hidden from your navigation menu.', 'event_espresso'), '<strong>[ESPRESSO_TXN_PAGE]</strong>' ); ?>
13
+<?php printf(__('This page processes the payments and is required. It should only contain the %s shortcode. No other content should be added and it should be hidden from your navigation menu.', 'event_espresso'), '<strong>[ESPRESSO_TXN_PAGE]</strong>'); ?>
14 14
 </li>
15 15
 <li>
16 16
 <strong><?php _e('Thank You Page', 'event_espresso'); ?></strong><br />
17
-<?php printf( __('This page is displayed after a successful transaction and is required. It should contain the %s shortcode. Additionally, you may customize this page by adding extra content to the page. It should be hidden from your navigation menu.', 'event_espresso'), '<strong>[ESPRESSO_THANK_YOU]</strong>' ); ?>
17
+<?php printf(__('This page is displayed after a successful transaction and is required. It should contain the %s shortcode. Additionally, you may customize this page by adding extra content to the page. It should be hidden from your navigation menu.', 'event_espresso'), '<strong>[ESPRESSO_THANK_YOU]</strong>'); ?>
18 18
 </li>
19 19
 <li>
20 20
 <strong><?php _e('Cancel / Return Page', 'event_espresso'); ?></strong><br />
21
-<?php printf( __('This page is displayed after an unsuccessful transaction and is required.  It should contain the %s shortcode. Additionally, you may customize this page by adding extra content to the page. It should be hidden from your navigation menu.', 'event_espresso'), '<strong>[ESPRESSO_CANCELLED]</strong>' ); ?>
21
+<?php printf(__('This page is displayed after an unsuccessful transaction and is required.  It should contain the %s shortcode. Additionally, you may customize this page by adding extra content to the page. It should be hidden from your navigation menu.', 'event_espresso'), '<strong>[ESPRESSO_CANCELLED]</strong>'); ?>
22 22
 </li>
23 23
 <li>
24 24
 <strong><?php _e('Event List', 'event_espresso'); ?></strong><br />
25
-<?php printf(__('If you would like to style the look of your events archive page, then follow the WordPress instructions for %1$screating a custom template for archive pages%2$s.', 'event_espresso'), '<a href="http://codex.wordpress.org/Post_Type_Templates">','</a>'); ?>
25
+<?php printf(__('If you would like to style the look of your events archive page, then follow the WordPress instructions for %1$screating a custom template for archive pages%2$s.', 'event_espresso'), '<a href="http://codex.wordpress.org/Post_Type_Templates">', '</a>'); ?>
26 26
 <ul>
27 27
 <li style="list-style-type: circle;">
28
-<?php printf( __('Build a template for your events - create a theme template named %1$s Then place it in your theme\'s root directory. For the default WordPress Twenty Thirteen theme, this location will be %2$s.', 'event_espresso'), '<strong>archive-espresso_events.php</strong>','wp-content/themes/twenty-fourteen' ); ?>
28
+<?php printf(__('Build a template for your events - create a theme template named %1$s Then place it in your theme\'s root directory. For the default WordPress Twenty Thirteen theme, this location will be %2$s.', 'event_espresso'), '<strong>archive-espresso_events.php</strong>', 'wp-content/themes/twenty-fourteen'); ?>
29 29
 </li>
30 30
 <li style="list-style-type: circle;">
31
-<?php printf( __('Build a template for a single event - create a theme template named %1$s Then place it in your theme\'s root directory. For the default WordPress Twenty Thirteen theme, this location will be %2$s.', 'event_espresso'), '<strong>single-espresso_events.php</strong>','wp-content/themes/twenty-fourteen' ); ?>
31
+<?php printf(__('Build a template for a single event - create a theme template named %1$s Then place it in your theme\'s root directory. For the default WordPress Twenty Thirteen theme, this location will be %2$s.', 'event_espresso'), '<strong>single-espresso_events.php</strong>', 'wp-content/themes/twenty-fourteen'); ?>
32 32
 </li>
33 33
 </ul>
34 34
 </li>
35 35
 <li>
36 36
 <strong><?php _e('Venue List', 'event_espresso'); ?></strong><br />
37
-<?php printf(__('If you would like to style the look of your venues archive page, then follow the WordPress instructions for %1$screating a custom template for archive pages%2$s.', 'event_espresso'), '<a href="http://codex.wordpress.org/Post_Type_Templates">','</a>'); ?>
37
+<?php printf(__('If you would like to style the look of your venues archive page, then follow the WordPress instructions for %1$screating a custom template for archive pages%2$s.', 'event_espresso'), '<a href="http://codex.wordpress.org/Post_Type_Templates">', '</a>'); ?>
38 38
 <ul>
39 39
 <li style="list-style-type: circle;">
40
-<?php printf( __('Build a template for your events - create a theme template named %1$s Then place it in your theme\'s root directory. For the default WordPress Twenty Thirteen theme, this location will be %2$s.', 'event_espresso'), '<strong>archive-espresso_venues.php</strong>','wp-content/themes/twenty-fourteen' ); ?>
40
+<?php printf(__('Build a template for your events - create a theme template named %1$s Then place it in your theme\'s root directory. For the default WordPress Twenty Thirteen theme, this location will be %2$s.', 'event_espresso'), '<strong>archive-espresso_venues.php</strong>', 'wp-content/themes/twenty-fourteen'); ?>
41 41
 </li>
42 42
 <li style="list-style-type: circle;">
43
-<?php printf( __('Build a template for a single event - create a theme template named %1$s Then place it in your theme\'s root directory. For the default WordPress Twenty Thirteen theme, this location will be %2$s.', 'event_espresso'), '<strong>single-espresso_venues.php</strong>','wp-content/themes/twenty-fourteen' ); ?>
43
+<?php printf(__('Build a template for a single event - create a theme template named %1$s Then place it in your theme\'s root directory. For the default WordPress Twenty Thirteen theme, this location will be %2$s.', 'event_espresso'), '<strong>single-espresso_venues.php</strong>', 'wp-content/themes/twenty-fourteen'); ?>
44 44
 </li>
45 45
 </ul>
46 46
 </li>
Please login to merge, or discard this patch.
admin_pages/general_settings/templates/espresso_page_settings.template.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 						</strong>
25 25
 						<?php echo EEH_Template::get_help_tab_link('registration_page_info'); ?>
26 26
 						<br />
27
-						<?php echo General_Settings_Admin_Page::edit_view_links( $reg_page_id );?>
27
+						<?php echo General_Settings_Admin_Page::edit_view_links($reg_page_id); ?>
28 28
 					</label>
29 29
 				</th>
30 30
 				<td>
@@ -32,10 +32,10 @@  discard block
 block discarded – undo
32 32
 						<option value="0">
33 33
 							<?php _e('Main Page', 'event_espresso'); ?>
34 34
 						</option>
35
-						<?php General_Settings_Admin_Page::page_settings_dropdown( $reg_page_id ); ?>
35
+						<?php General_Settings_Admin_Page::page_settings_dropdown($reg_page_id); ?>
36 36
 					</select>
37 37
 					<span>
38
-						<?php echo General_Settings_Admin_Page::page_and_shortcode_status( $reg_page_obj, '[ESPRESSO_CHECKOUT]' ); ?>
38
+						<?php echo General_Settings_Admin_Page::page_and_shortcode_status($reg_page_obj, '[ESPRESSO_CHECKOUT]'); ?>
39 39
 					</span>
40 40
 					<br />
41 41
 					<p class="description">
@@ -59,7 +59,7 @@  discard block
 block discarded – undo
59 59
 						<?php echo EEH_Template::get_help_tab_link('notify_url_info'); ?>
60 60
 						<br />
61 61
 						<span class="lt-grey-text"><?php _e('Notify URL (processes payments)', 'event_espresso'); ?></span><br/>
62
-						<?php echo General_Settings_Admin_Page::edit_view_links( $txn_page_id );?>
62
+						<?php echo General_Settings_Admin_Page::edit_view_links($txn_page_id); ?>
63 63
 					</label>
64 64
 				</th>
65 65
 				<td>
@@ -67,16 +67,16 @@  discard block
 block discarded – undo
67 67
 						<option value="0">
68 68
 							<?php _e('Main Page', 'event_espresso'); ?>
69 69
 						</option>
70
-						<?php General_Settings_Admin_Page::page_settings_dropdown( $txn_page_id ); ?>
70
+						<?php General_Settings_Admin_Page::page_settings_dropdown($txn_page_id); ?>
71 71
 					</select>
72 72
 					<span>
73
-						<?php echo General_Settings_Admin_Page::page_and_shortcode_status( $txn_page_obj, '[ESPRESSO_TXN_PAGE]' ); ?>
73
+						<?php echo General_Settings_Admin_Page::page_and_shortcode_status($txn_page_obj, '[ESPRESSO_TXN_PAGE]'); ?>
74 74
 					</span>
75 75
 					<br />
76 76
 					<p class="description">
77 77
 						<?php
78 78
 						echo sprintf(
79
-							__( 'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain the %s shortcode.', 'event_espresso' ),
79
+							__('This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain the %s shortcode.', 'event_espresso'),
80 80
 							'<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_TXN_PAGE]</span>'
81 81
 						);
82 82
 						?>
@@ -93,7 +93,7 @@  discard block
 block discarded – undo
93 93
 						</strong>
94 94
 						<?php echo EEH_Template::get_help_tab_link('return_url_info'); ?>
95 95
 						<br />
96
-						<?php echo General_Settings_Admin_Page::edit_view_links( $thank_you_page_id );?>
96
+						<?php echo General_Settings_Admin_Page::edit_view_links($thank_you_page_id); ?>
97 97
 					</label>
98 98
 				</th>
99 99
 				<td>
@@ -101,16 +101,16 @@  discard block
 block discarded – undo
101 101
 						<option value="0">
102 102
 							<?php _e('Main Page', 'event_espresso'); ?>
103 103
 						</option>
104
-						<?php General_Settings_Admin_Page::page_settings_dropdown( $thank_you_page_id ); ?>
104
+						<?php General_Settings_Admin_Page::page_settings_dropdown($thank_you_page_id); ?>
105 105
 					</select>
106 106
 					<span>
107
-						<?php echo General_Settings_Admin_Page::page_and_shortcode_status( $thank_you_page_obj, '[ESPRESSO_THANK_YOU]' ); ?>
107
+						<?php echo General_Settings_Admin_Page::page_and_shortcode_status($thank_you_page_obj, '[ESPRESSO_THANK_YOU]'); ?>
108 108
 					</span>
109 109
 					<br />
110 110
 					<p class="description">
111 111
 						<?php
112 112
 						echo sprintf(
113
-							__( 'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain the %s shortcode.', 'event_espresso' ),
113
+							__('This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain the %s shortcode.', 'event_espresso'),
114 114
 							'<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_THANK_YOU]</span>'
115 115
 						);
116 116
 						?>
@@ -127,7 +127,7 @@  discard block
 block discarded – undo
127 127
 						</strong>
128 128
 						<?php echo EEH_Template::get_help_tab_link('cancel_return_info'); ?>
129 129
 						<br />
130
-						<?php echo General_Settings_Admin_Page::edit_view_links( $cancel_page_id );?>
130
+						<?php echo General_Settings_Admin_Page::edit_view_links($cancel_page_id); ?>
131 131
 					</label>
132 132
 				</th>
133 133
 				<td>
@@ -135,16 +135,16 @@  discard block
 block discarded – undo
135 135
 						<option value="0">
136 136
 							<?php _e('Main Page', 'event_espresso'); ?>
137 137
 						</option>
138
-						<?php General_Settings_Admin_Page::page_settings_dropdown( $cancel_page_id ); ?>
138
+						<?php General_Settings_Admin_Page::page_settings_dropdown($cancel_page_id); ?>
139 139
 					</select>
140 140
 					<span>
141
-						<?php echo General_Settings_Admin_Page::page_and_shortcode_status( $cancel_page_obj, '[ESPRESSO_CANCELLED]' ); ?>
141
+						<?php echo General_Settings_Admin_Page::page_and_shortcode_status($cancel_page_obj, '[ESPRESSO_CANCELLED]'); ?>
142 142
 					</span>
143 143
 					<br />
144 144
 					<p class="description">
145 145
 						<?php
146 146
 						echo sprintf(
147
-							__( 'This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain a "cancelled transaction" message and the %s shortcode.', 'event_espresso' ),
147
+							__('This page should be hidden from your navigation, but still viewable to the public (not password protected), and should always contain a "cancelled transaction" message and the %s shortcode.', 'event_espresso'),
148 148
 							'<span class="highlight" style="padding:3px;margin:0;">[ESPRESSO_CANCELLED]</span>'
149 149
 						);
150 150
 						?>
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
 						</strong>
162 162
 						<?php echo EEH_Template::get_help_tab_link('event_list_cpt_info'); ?>
163 163
 						<br />
164
-						<a href='<?php echo get_post_type_archive_link('espresso_events') ?>'><?php	_e('View', 'event_espresso');?></a>
164
+						<a href='<?php echo get_post_type_archive_link('espresso_events') ?>'><?php	_e('View', 'event_espresso'); ?></a>
165 165
 					</label>
166 166
 				</th>
167 167
 				<td>
@@ -169,7 +169,7 @@  discard block
 block discarded – undo
169 169
 						<?php echo __('Events are custom post types and use WordPress\' normal archive pages for displaying events.', 'event_espresso') ?>
170 170
 					</p>
171 171
 					<p class="description">
172
-						<?php printf(__('If you would still like your events on a page like in Event Espresso 3.1 or earlier, simply create a page and place a shortcode to display them on the page, as described %s here %s', 'event_espresso'),'<a href="admin.php?page=espresso_support">','</a>') ?>
172
+						<?php printf(__('If you would still like your events on a page like in Event Espresso 3.1 or earlier, simply create a page and place a shortcode to display them on the page, as described %s here %s', 'event_espresso'), '<a href="admin.php?page=espresso_support">', '</a>') ?>
173 173
 					</p>
174 174
 					<br/><br/>
175 175
 				</td>
@@ -183,7 +183,7 @@  discard block
 block discarded – undo
183 183
 						</strong>
184 184
 						<?php echo EEH_Template::get_help_tab_link('venue_list_cpt_info'); ?>
185 185
 						<br />
186
-						<a href='<?php echo get_post_type_archive_link('espresso_venues') ?>'><?php	_e('View', 'event_espresso');?></a>
186
+						<a href='<?php echo get_post_type_archive_link('espresso_venues') ?>'><?php	_e('View', 'event_espresso'); ?></a>
187 187
 					</label>
188 188
 				</th>
189 189
 				<td>
@@ -191,7 +191,7 @@  discard block
 block discarded – undo
191 191
 						<?php echo __('Venues are custom post types and use WordPress\' normal archive pages for displaying events.', 'event_espresso') ?>
192 192
 					</p>
193 193
 					<p class="description">
194
-						<?php printf(__('If you would still like your venues on a page like in Event Espresso 3.1 or earlier, simply create a page and place a shortcode to display them on the page, as described %s here %s', 'event_espresso'),'<a href="admin.php?page=espresso_support">','</a>') ?>
194
+						<?php printf(__('If you would still like your venues on a page like in Event Espresso 3.1 or earlier, simply create a page and place a shortcode to display them on the page, as described %s here %s', 'event_espresso'), '<a href="admin.php?page=espresso_support">', '</a>') ?>
195 195
 					</p>
196 196
 				</td>
197 197
 			</tr>
Please login to merge, or discard this patch.