Completed
Branch BUG-9853-event-is-active (b68317)
by
unknown
76:08 queued 65:59
created
core/admin/templates/admin_details_wrapper_no_sidebar.template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -13,8 +13,8 @@
 block discarded – undo
13 13
 			
14 14
 			
15 15
 			<div id="postbox-container-2" class="postbox-container">
16
-				<?php do_meta_boxes( $current_page, 'normal', NULL ); ?>
17
-				<?php do_meta_boxes( $current_page, 'advanced', NULL ); ?>
16
+				<?php do_meta_boxes($current_page, 'normal', NULL); ?>
17
+				<?php do_meta_boxes($current_page, 'advanced', NULL); ?>
18 18
 			</div>
19 19
 			<!-- postbox-container-2 -->
20 20
 			
Please login to merge, or discard this patch.
admin/templates/admin_general_metabox_contents_espresso_links.template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
1 1
 <div class="padding">
2 2
 	   	<ul class="infolinks">
3 3
 	   		<li>
4
-	   			<?php echo '<a href="http://eventespresso.com/wiki/installation/" target="_blank">'.__('Installation', 'event_espresso') . '</a>  &amp; <a href="http://eventespresso.com/wiki/setting-up-event-espresso/" target="_blank">' . __('Usage Guide').'</a>'; ?>
4
+	   			<?php echo '<a href="http://eventespresso.com/wiki/installation/" target="_blank">'.__('Installation', 'event_espresso').'</a>  &amp; <a href="http://eventespresso.com/wiki/setting-up-event-espresso/" target="_blank">'.__('Usage Guide').'</a>'; ?>
5 5
 	   		</li>
6 6
 	   		<li>
7 7
 		   		<a href="http://eventespresso.com/wiki/put-custom-templates/" target="_blank">
@@ -30,7 +30,7 @@  discard block
 block discarded – undo
30 30
 	   			</a>
31 31
 	   		</li>
32 32
 	   		<li>
33
-	   			<?php echo '<a href="http://eventespresso.com/pricing/" target="_blank">'.__('Plugins', 'event_espresso'). '</a> &amp; <a href="http://eventespresso.com/add-ons/" target="_blank">' .__('Add-ons', 'event_espresso').'</a>'; ?><br />
33
+	   			<?php echo '<a href="http://eventespresso.com/pricing/" target="_blank">'.__('Plugins', 'event_espresso').'</a> &amp; <a href="http://eventespresso.com/add-ons/" target="_blank">'.__('Add-ons', 'event_espresso').'</a>'; ?><br />
34 34
 	   			<br />
35 35
 	   			<ol>
36 36
 	   				<li>
Please login to merge, or discard this patch.
core/admin/templates/admin_list_wrapper.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php echo $before_list_table; ?>
2 2
 <?php $list_table->display_views(); ?>
3
-<form id="<?php echo $list_table_class; ?>-table-frm" action="<?php echo $table_url;?>" method="get">
3
+<form id="<?php echo $list_table_class; ?>-table-frm" action="<?php echo $table_url; ?>" method="get">
4 4
 	<?php echo $sortable_list_table_form_fields; ?>
5 5
 	<?php echo $list_table->search_box($search['btn_label'], $current_page); ?>
6 6
 	<?php echo $list_table->display(); ?>
Please login to merge, or discard this patch.
core/admin/templates/admin_reports.template.php 1 patch
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,6 +1,6 @@
 block discarded – undo
1 1
 <?php //EEH_Debug_Tools::printr( $admin_reports, '$admin_reports' ); ?>
2 2
 
3
-<?php foreach ( $admin_reports as $report) : ?>
3
+<?php foreach ($admin_reports as $report) : ?>
4 4
 
5 5
 	<div id="<?php echo $report; ?>" class="admin-report-chart-dv" style="width:95%; min-height:420px; margin:20px 4% 40px 1%;"></div>
6 6
 
Please login to merge, or discard this patch.
core/admin/templates/espresso_ratings_request_content.template.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@
 block discarded – undo
1 1
 <div class="padding">
2
-	<p><?php _e( 'We need your help to continue maintaining and providing this plugin for free. You can help by leaving a positive review in the WordPress plugin directory. 5 star ratings bring Event Espresso Decaf to the attention of more users which increases our support and features for this version of Event Espresso.', 'event_espresso' ); ?></p>
3
-	<p><?php _e( 'Rate it five stars today!', 'event_espresso' ); ?></p><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span>
4
-	<p><a class="button button-primary" href="https://wordpress.org/plugins/event-espresso-decaf/"><?php _e( 'Rate It!', 'event_espresso' ); ?></a></p>
2
+	<p><?php _e('We need your help to continue maintaining and providing this plugin for free. You can help by leaving a positive review in the WordPress plugin directory. 5 star ratings bring Event Espresso Decaf to the attention of more users which increases our support and features for this version of Event Espresso.', 'event_espresso'); ?></p>
3
+	<p><?php _e('Rate it five stars today!', 'event_espresso'); ?></p><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span><span class="ee-wp-blue dashicons dashicons-star-filled"></span>
4
+	<p><a class="button button-primary" href="https://wordpress.org/plugins/event-espresso-decaf/"><?php _e('Rate It!', 'event_espresso'); ?></a></p>
5 5
 </div>
6 6
\ No newline at end of file
Please login to merge, or discard this patch.
core/admin/templates/status_dropdown.template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,8 +3,8 @@
 block discarded – undo
3 3
 	<span id="localized_status_save"><?php echo $localized_status_save; ?></span>
4 4
 	<span id="cur_stat_id"><?php echo $cur_status; ?></span>
5 5
 	<select name='ee_post_status' id='ee_post_status'>
6
- 	<?php foreach ( $statuses as $status => $label ) : ?>
7
-		<option<?php selected( $cur_status, $status ); ?> value='<?php echo $status; ?>'><?php echo $label; ?></option>
6
+ 	<?php foreach ($statuses as $status => $label) : ?>
7
+		<option<?php selected($cur_status, $status); ?> value='<?php echo $status; ?>'><?php echo $label; ?></option>
8 8
 	<?php
9 9
 	endforeach;
10 10
 	?>
Please login to merge, or discard this patch.
4_1_0_stages/EE_DMS_4_1_0_category_details.dmsstage.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -6,16 +6,16 @@  discard block
 block discarded – undo
6 6
  * Authorize.net AIM, Bank, Check, Invoice, Paypal Pro and Paypal Standard.
7 7
  * 
8 8
  */
9
-class EE_DMS_4_1_0_category_details extends EE_Data_Migration_Script_Stage{
9
+class EE_DMS_4_1_0_category_details extends EE_Data_Migration_Script_Stage {
10 10
 private $_old_table;
11 11
 private $_new_table;
12 12
 private $_new_term_table;
13
-function _migration_step($num_items=50){
13
+function _migration_step($num_items = 50) {
14 14
 	global $wpdb;
15 15
 	$start_at_record = $this->count_records_migrated();
16
-	$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d",$start_at_record,$num_items),ARRAY_A);
16
+	$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
17 17
 	$items_actually_migrated = 0;
18
-	foreach($rows as $category_detail_row){
18
+	foreach ($rows as $category_detail_row) {
19 19
 		$term_and_taxonomy_ids = wp_insert_term(
20 20
 				stripslashes($category_detail_row['category_name']),
21 21
 				'espresso_event_categories',
@@ -23,8 +23,8 @@  discard block
 block discarded – undo
23 23
 					'description'=>  stripslashes($category_detail_row['category_desc']),
24 24
 					'slug'=>$category_detail_row['category_identifier']
25 25
 				));
26
-		if($term_and_taxonomy_ids instanceof WP_Error){
27
-			$this->add_error(sprintf(__("Could not create WP Term_Taxonomy from old category: %s. The Error was: %s", "event_espresso"),  $this->_json_encode($category_detail_row),$term_and_taxonomy_ids->get_error_message()));
26
+		if ($term_and_taxonomy_ids instanceof WP_Error) {
27
+			$this->add_error(sprintf(__("Could not create WP Term_Taxonomy from old category: %s. The Error was: %s", "event_espresso"), $this->_json_encode($category_detail_row), $term_and_taxonomy_ids->get_error_message()));
28 28
 			$items_actually_migrated++;
29 29
 			continue;
30 30
 		}
@@ -34,7 +34,7 @@  discard block
 block discarded – undo
34 34
 		$this->get_migration_script()->set_mapping($this->_old_table, $category_detail_row['id'], $this->_new_table, $term_taxonomy_id);
35 35
 		$items_actually_migrated++;
36 36
 	}
37
-	if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
37
+	if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
38 38
 		$this->set_completed();
39 39
 	}
40 40
 	return $items_actually_migrated;
Please login to merge, or discard this patch.
4_1_0_stages/EE_DMS_4_1_0_event_category.dmsstage.php 3 patches
Indentation   -2 removed lines patch added patch discarded remove patch
@@ -24,8 +24,6 @@
 block discarded – undo
24 24
 				'term_taxonomy_id'=>new EE_Foreign_Key_Int_Field('term_taxonomy_id', __('Term (in context of a taxonomy) ID','event_espresso'), false, 0, 'Term_Taxonomy'),
25 25
 				'term_order'=>new EE_Integer_Field('term_order', __('Term Order','event_espresso'), false, 0)
26 26
 			));
27
-
28
-
29 27
  *
30 28
  */
31 29
 class EE_DMS_4_1_0_event_category extends EE_Data_Migration_Script_Stage{
Please login to merge, or discard this patch.
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -28,22 +28,22 @@  discard block
 block discarded – undo
28 28
 
29 29
  *
30 30
  */
31
-class EE_DMS_4_1_0_event_category extends EE_Data_Migration_Script_Stage{
31
+class EE_DMS_4_1_0_event_category extends EE_Data_Migration_Script_Stage {
32 32
 	private $_old_table;
33 33
 	private $_new_table;
34
-	function _migration_step($num_items=50){
34
+	function _migration_step($num_items = 50) {
35 35
 		global $wpdb;
36 36
 		$start_at_record = $this->count_records_migrated();
37
-		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d",$start_at_record,$num_items),ARRAY_A);
37
+		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
38 38
 		$items_actually_migrated = 0;
39
-		foreach($rows as $event_venue_rel){
39
+		foreach ($rows as $event_venue_rel) {
40 40
 			$term_relation_id = $this->_add_relation_from_event_to_term_taxonomy($event_venue_rel);
41
-			if($term_relation_id){
41
+			if ($term_relation_id) {
42 42
 				$this->get_migration_script()->set_mapping($this->_old_table, $event_venue_rel['id'], $this->_new_table, $term_relation_id);
43 43
 			}
44 44
 			$items_actually_migrated++;
45 45
 		}
46
-		if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
46
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
47 47
 			$this->set_completed();
48 48
 		}
49 49
 		return $items_actually_migrated;
@@ -67,16 +67,16 @@  discard block
 block discarded – undo
67 67
 	 * @param array $old_event_cat_relation
68 68
 	 * @return int
69 69
 	 */
70
-	private function _add_relation_from_event_to_term_taxonomy($old_event_cat_relation){
70
+	private function _add_relation_from_event_to_term_taxonomy($old_event_cat_relation) {
71 71
 		global $wpdb;
72 72
 		$new_event_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_detail", intval($old_event_cat_relation['event_id']), $wpdb->prefix."posts");
73 73
 		$new_term_taxonomy_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_category_detail", intval($old_event_cat_relation['cat_id']), $wpdb->prefix."term_taxonomy");
74
-		if( ! $new_event_id){
75
-			$this->add_error(sprintf(__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"),$old_event_cat_relation['event_id']));
74
+		if ( ! $new_event_id) {
75
+			$this->add_error(sprintf(__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"), $old_event_cat_relation['event_id']));
76 76
 			return 0;
77 77
 		}
78
-		if( ! $new_term_taxonomy_id){
79
-			$this->add_error(sprintf(__("Could not find 4.1 term-taxonomy id for 3.1 category #%d.", "event_espresso"),$old_event_cat_relation['cat_id']));
78
+		if ( ! $new_term_taxonomy_id) {
79
+			$this->add_error(sprintf(__("Could not find 4.1 term-taxonomy id for 3.1 category #%d.", "event_espresso"), $old_event_cat_relation['cat_id']));
80 80
 			return 0;
81 81
 		}
82 82
 		$cols_n_values = array(
@@ -85,19 +85,19 @@  discard block
 block discarded – undo
85 85
 			'term_order'=>0
86 86
 		);
87 87
 		$datatypes = array(
88
-			'%d',//object_id
89
-			'%d',//term_taxonomy_id
90
-			'%d',//term_order
88
+			'%d', //object_id
89
+			'%d', //term_taxonomy_id
90
+			'%d', //term_order
91 91
 		);
92
-		$success = $wpdb->insert($this->_new_table,$cols_n_values,$datatypes);
93
-		if ( ! $success){
92
+		$success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
93
+		if ( ! $success) {
94 94
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event_cat_relation, $this->_new_table, $cols_n_values, $datatypes));
95 95
 			return 0;
96
-		}else{
96
+		} else {
97 97
 			//increment the term-taxonomie's count
98
-			$success = $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->term_taxonomy} SET count = count +1 WHERE term_taxonomy_id=%d", $new_term_taxonomy_id ) );
99
-			if( ! $success ){
100
-				$this->add_error(sprintf( __( 'Could not increment term_taxonomy\'s count because %s', 'event_espresso' ),$wpdb->last_error));
98
+			$success = $wpdb->query($wpdb->prepare("UPDATE {$wpdb->term_taxonomy} SET count = count +1 WHERE term_taxonomy_id=%d", $new_term_taxonomy_id));
99
+			if ( ! $success) {
100
+				$this->add_error(sprintf(__('Could not increment term_taxonomy\'s count because %s', 'event_espresso'), $wpdb->last_error));
101 101
 			}
102 102
 		}
103 103
 		return $wpdb->insert_id;
Please login to merge, or discard this patch.
Braces   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -93,7 +93,7 @@
 block discarded – undo
93 93
 		if ( ! $success){
94 94
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event_cat_relation, $this->_new_table, $cols_n_values, $datatypes));
95 95
 			return 0;
96
-		}else{
96
+		} else{
97 97
 			//increment the term-taxonomie's count
98 98
 			$success = $wpdb->query( $wpdb->prepare( "UPDATE {$wpdb->term_taxonomy} SET count = count +1 WHERE term_taxonomy_id=%d", $new_term_taxonomy_id ) );
99 99
 			if( ! $success ){
Please login to merge, or discard this patch.
data_migration_scripts/4_1_0_stages/EE_DMS_4_1_0_event_venue.dmsstage.php 2 patches
Indentation   -3 removed lines patch added patch discarded remove patch
@@ -25,9 +25,6 @@
 block discarded – undo
25 25
 				
26 26
 			)
27 27
 		);
28
-
29
-
30
-
31 28
  * 
32 29
  */
33 30
 class EE_DMS_4_1_0_event_venue extends EE_Data_Migration_Script_Stage{
Please login to merge, or discard this patch.
Spacing   +17 added lines, -17 removed lines patch added patch discarded remove patch
@@ -30,20 +30,20 @@  discard block
 block discarded – undo
30 30
 
31 31
  * 
32 32
  */
33
-class EE_DMS_4_1_0_event_venue extends EE_Data_Migration_Script_Stage{
33
+class EE_DMS_4_1_0_event_venue extends EE_Data_Migration_Script_Stage {
34 34
 	private $_old_table;
35 35
 	private $_new_table;
36
-	function _migration_step($num_items=50){
36
+	function _migration_step($num_items = 50) {
37 37
 		
38 38
 		global $wpdb;
39 39
 		$start_at_record = $this->count_records_migrated();
40
-		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d",$start_at_record,$num_items),ARRAY_A);
40
+		$rows = $wpdb->get_results($wpdb->prepare("SELECT * FROM $this->_old_table LIMIT %d,%d", $start_at_record, $num_items), ARRAY_A);
41 41
 		$items_actually_migrated = 0;
42
-		foreach($rows as $event_venue_rel){
42
+		foreach ($rows as $event_venue_rel) {
43 43
 			$this->_insert_new_event_to_venue_rel($event_venue_rel);
44 44
 			$items_actually_migrated++;
45 45
 		}
46
-		if($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()){
46
+		if ($this->count_records_migrated() + $items_actually_migrated >= $this->count_records_to_migrate()) {
47 47
 			$this->set_completed();
48 48
 		}
49 49
 		return $items_actually_migrated;
@@ -67,26 +67,26 @@  discard block
 block discarded – undo
67 67
 	 * @param array $old_event_venue_rel
68 68
 	 * @return int
69 69
 	 */
70
-	private function _insert_new_event_to_venue_rel($old_event_venue_rel){
70
+	private function _insert_new_event_to_venue_rel($old_event_venue_rel) {
71 71
 		global $wpdb;
72 72
 		$new_event_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_detail", $old_event_venue_rel['event_id'], $wpdb->prefix."posts");
73 73
 		$new_venue_id = $this->get_migration_script()->get_mapping_new_pk($wpdb->prefix."events_venue", $old_event_venue_rel['venue_id'], $wpdb->prefix."posts");
74
-		if( ! $new_event_id){
75
-			$this->add_error(sprintf(__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"),$old_event_venue_rel['event_id']));
74
+		if ( ! $new_event_id) {
75
+			$this->add_error(sprintf(__("Could not find 4.1 event id for 3.1 event #%d.", "event_espresso"), $old_event_venue_rel['event_id']));
76 76
 			return 0;
77 77
 		}
78
-		if( ! $new_venue_id){
79
-			$this->add_error(sprintf(__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"),$old_event_venue_rel['venue_id']));
78
+		if ( ! $new_venue_id) {
79
+			$this->add_error(sprintf(__("Could not find 4.1 venue id for 3.1 venue #%d.", "event_espresso"), $old_event_venue_rel['venue_id']));
80 80
 			return 0;
81 81
 		}
82 82
 		//first ensure there are no other relation entries for this event
83 83
 		//because although EE4 supports it, EE3 didn't really
84
-		$wpdb->delete( $this->_new_table, 
84
+		$wpdb->delete($this->_new_table, 
85 85
 				array(
86 86
 					'EVT_ID' => $new_event_id,
87 87
 				),
88 88
 				array(
89
-					'%d',//EVT_ID
89
+					'%d', //EVT_ID
90 90
 				));
91 91
 //		echo "last query". $wpdb->last_query;die;
92 92
 		$cols_n_values = array(
@@ -95,12 +95,12 @@  discard block
 block discarded – undo
95 95
 			'EVV_primary'=>true
96 96
 		);
97 97
 		$datatypes = array(
98
-			'%d',//EVT_ID
99
-			'%d',//VNU_ID
100
-			'%d',//EVT_primary
98
+			'%d', //EVT_ID
99
+			'%d', //VNU_ID
100
+			'%d', //EVT_primary
101 101
 		);
102
-		$success = $wpdb->insert($this->_new_table,$cols_n_values,$datatypes);
103
-		if ( ! $success){
102
+		$success = $wpdb->insert($this->_new_table, $cols_n_values, $datatypes);
103
+		if ( ! $success) {
104 104
 			$this->add_error($this->get_migration_script()->_create_error_message_for_db_insertion($this->_old_table, $old_event_venue_rel, $this->_new_table, $cols_n_values, $datatypes));
105 105
 			return 0;
106 106
 		}
Please login to merge, or discard this patch.