Completed
Branch FET-10840-domain-class (a1fdb0)
by
unknown
139:37 queued 128:02
created
core/helpers/EEH_Formatter.helper.php 2 patches
Doc Comments   +1 added lines patch added patch discarded remove patch
@@ -74,6 +74,7 @@
 block discarded – undo
74 74
 	 * [ee_tep_not_null description]
75 75
 	 *
76 76
 	 * @param  string | array $value [description]
77
+	 * @param string $value
77 78
 	 * @return bool       [description]
78 79
 	 */
79 80
 	static public function ee_tep_not_null( $value ) {
Please login to merge, or discard this patch.
Spacing   +17 added lines, -17 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
 
@@ -26,8 +26,8 @@  discard block
 block discarded – undo
26 26
 	 * @param  string $content content to format
27 27
 	 * @return string          formatted content
28 28
 	 */
29
-	static public function admin_format_content( $content = '' ) {
30
-		return wpautop( stripslashes_deep( html_entity_decode( $content, ENT_QUOTES, "UTF-8" ) ) );
29
+	static public function admin_format_content($content = '') {
30
+		return wpautop(stripslashes_deep(html_entity_decode($content, ENT_QUOTES, "UTF-8")));
31 31
 	}
32 32
 
33 33
 
@@ -43,14 +43,14 @@  discard block
 block discarded – undo
43 43
 	 * @param  boolean $protected true then we run htmlspecialchars and return
44 44
 	 * @return string
45 45
 	 */
46
-	static public function ee_tep_output_string( $string, $translate = false, $protected = false ) {
47
-		if ( $protected === true ) {
48
-			return htmlspecialchars( $string );
46
+	static public function ee_tep_output_string($string, $translate = false, $protected = false) {
47
+		if ($protected === true) {
48
+			return htmlspecialchars($string);
49 49
 		} else {
50
-			if ( $translate === false ) {
51
-				return self::ee_tep_parse_input_field_data( $string, array( '"' => '&quot;' ) );
50
+			if ($translate === false) {
51
+				return self::ee_tep_parse_input_field_data($string, array('"' => '&quot;'));
52 52
 			} else {
53
-				return self::ee_tep_parse_input_field_data( $string, $translate );
53
+				return self::ee_tep_parse_input_field_data($string, $translate);
54 54
 			}
55 55
 		}
56 56
 	}
@@ -64,8 +64,8 @@  discard block
 block discarded – undo
64 64
 	 * @param         array ] $parse array in the form array( 'from' => 'to', ... )
65 65
 	 * @return string
66 66
 	 */
67
-	static public function ee_tep_parse_input_field_data( $data, $parse ) {
68
-		return strtr( trim( $data ), $parse );
67
+	static public function ee_tep_parse_input_field_data($data, $parse) {
68
+		return strtr(trim($data), $parse);
69 69
 	}
70 70
 
71 71
 
@@ -76,15 +76,15 @@  discard block
 block discarded – undo
76 76
 	 * @param  string | array $value [description]
77 77
 	 * @return bool       [description]
78 78
 	 */
79
-	static public function ee_tep_not_null( $value ) {
80
-		if ( is_array( $value ) ) {
81
-			if ( count( $value ) > 0 ) {
79
+	static public function ee_tep_not_null($value) {
80
+		if (is_array($value)) {
81
+			if (count($value) > 0) {
82 82
 				return true;
83 83
 			} else {
84 84
 				return false;
85 85
 			}
86 86
 		} else {
87
-			if ( ( $value !== '' ) && ( strtolower( $value ) !== 'null' ) && ( strlen( trim( $value ) ) > 0 ) ) {
87
+			if (($value !== '') && (strtolower($value) !== 'null') && (strlen(trim($value)) > 0)) {
88 88
 				return true;
89 89
 			} else {
90 90
 				return false;
@@ -104,7 +104,7 @@  discard block
 block discarded – undo
104 104
 	 * @return string
105 105
 	 * @deprecated v4.6.21
106 106
 	 */
107
-	static public function event_date_display( $date, $format = '' ) {
107
+	static public function event_date_display($date, $format = '') {
108 108
 		EE_Error::doing_it_wrong(
109 109
 			__METHOD__,
110 110
 			__(
Please login to merge, or discard this patch.
event_single_caff/templates/admin-event-single-settings.template.php 1 patch
Spacing   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -1,9 +1,9 @@  discard block
 block discarded – undo
1 1
 <?php
2
-add_filter( 'FHEE__EEH_Form_Fields__label_html', '__return_empty_string' );
2
+add_filter('FHEE__EEH_Form_Fields__label_html', '__return_empty_string');
3 3
 $values = EEH_Form_Fields::prep_answer_options(
4 4
 	array(
5
-		array( 'id' => 1, 'text' => __( 'Yes', 'event_espresso' ) ),
6
-		array( 'id' => 0, 'text' => __( 'No', 'event_espresso' ) )
5
+		array('id' => 1, 'text' => __('Yes', 'event_espresso')),
6
+		array('id' => 0, 'text' => __('No', 'event_espresso'))
7 7
 	)
8 8
 );
9 9
 ?>
@@ -22,27 +22,27 @@  discard block
 block discarded – undo
22 22
 					</label>
23 23
 				</th>
24 24
 				<td>
25
-					<?php echo EEH_Form_Fields::select( 'display_status_banner_single', $display_status_banner_single, $values, 'display_status_banner_single', 'display_status_banner_single' ); ?>
26
-					<p class="description"><?php _e( 'Selecting "Yes" will inject an Event Status banner with the title whenever Events are displaying on the single event page.', 'event_espresso' ); ?></p>
25
+					<?php echo EEH_Form_Fields::select('display_status_banner_single', $display_status_banner_single, $values, 'display_status_banner_single', 'display_status_banner_single'); ?>
26
+					<p class="description"><?php _e('Selecting "Yes" will inject an Event Status banner with the title whenever Events are displaying on the single event page.', 'event_espresso'); ?></p>
27 27
 				</td>
28 28
 			</tr>
29 29
 
30 30
 			<tr>
31 31
 				<th>
32 32
 					<label for="display_venue">
33
-						<?php _e( 'Display Venue Details', 'event_espresso' ); ?><?php echo EEH_Template::get_help_tab_link('display_addresses_in_reg_form_info');?>
33
+						<?php _e('Display Venue Details', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link('display_addresses_in_reg_form_info'); ?>
34 34
 					</label>
35 35
 				</th>
36 36
 				<td>
37
-					<?php echo EEH_Form_Fields::select( 'display_venue', $display_venue, $values, 'display_venue', 'display_venue' ); ?>
38
-					<p class="description"><?php _e( 'Do not use this if you are using the venue shortcodes in your event description.', 'event_espresso' ); ?></p>
37
+					<?php echo EEH_Form_Fields::select('display_venue', $display_venue, $values, 'display_venue', 'display_venue'); ?>
38
+					<p class="description"><?php _e('Do not use this if you are using the venue shortcodes in your event description.', 'event_espresso'); ?></p>
39 39
 				</td>
40 40
 			</tr>
41 41
 
42 42
 			<tr>
43 43
 				<th>
44 44
 					<label for="EED_Events_Single_use_sortable_display_order">
45
-						<?php _e( 'Use Custom Display Order?', 'event_espresso' ); ?>
45
+						<?php _e('Use Custom Display Order?', 'event_espresso'); ?>
46 46
 					</label>
47 47
 				</th>
48 48
 				<td>
@@ -58,7 +58,7 @@  discard block
 block discarded – undo
58 58
 					<p class="description ">
59 59
 						<?php
60 60
 						echo sprintf(
61
-							__( '%1$sPlease Note:%2$s%3$sIf you are currently using filters to customize the display order for elements within the Event Single page display, then you do NOT activate this feature until those filters have been removed or disabled. If this feature is activated while still using such filters, duplicate event content such as the ticket selector, datetimes, or venue information could be displayed on the frontend of the site. Please verify that this is not the case after activating this feature.', 'event_espresso' ),
61
+							__('%1$sPlease Note:%2$s%3$sIf you are currently using filters to customize the display order for elements within the Event Single page display, then you do NOT activate this feature until those filters have been removed or disabled. If this feature is activated while still using such filters, duplicate event content such as the ticket selector, datetimes, or venue information could be displayed on the frontend of the site. Please verify that this is not the case after activating this feature.', 'event_espresso'),
62 62
 							'<span class="important-notice">',
63 63
 							'</span>',
64 64
 							'<br />'
@@ -70,11 +70,11 @@  discard block
 block discarded – undo
70 70
 
71 71
 			<tr>
72 72
 				<th>
73
-					<?php _e('Display Order', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link('display_addresses_in_reg_form_info');?>
73
+					<?php _e('Display Order', 'event_espresso'); ?><?php echo EEH_Template::get_help_tab_link('display_addresses_in_reg_form_info'); ?>
74 74
 				</th>
75 75
 				<td>
76 76
 
77
-					<?php wp_nonce_field( 'espresso_update_event_single_order', 'espresso_update_event_single_order_nonce', false ); ?>
77
+					<?php wp_nonce_field('espresso_update_event_single_order', 'espresso_update_event_single_order_nonce', false); ?>
78 78
 					<?php echo $event_single_display_order; ?>
79 79
 
80 80
 					<p class="description"><?php _e('Drag and Drop the above to determine the display order of the Event Description, Date and Times, Ticket Selector, and Venue Information on the single event page.', 'event_espresso'); ?></p>
Please login to merge, or discard this patch.
events_archive_caff/templates/admin-event-list-settings.template.php 1 patch
Spacing   +30 added lines, -30 removed lines patch added patch discarded remove patch
@@ -1,15 +1,15 @@  discard block
 block discarded – undo
1 1
 <?php
2
-add_filter( 'FHEE__EEH_Form_Fields__label_html', '__return_empty_string' );
2
+add_filter('FHEE__EEH_Form_Fields__label_html', '__return_empty_string');
3 3
 
4
-$values = EEH_Form_Fields::prep_answer_options( array(
5
-	array( 'id' => 1, 'text' => __('Yes', 'event_espresso')),
6
-	array( 'id' => 0, 'text' => __('No', 'event_espresso'))
4
+$values = EEH_Form_Fields::prep_answer_options(array(
5
+	array('id' => 1, 'text' => __('Yes', 'event_espresso')),
6
+	array('id' => 0, 'text' => __('No', 'event_espresso'))
7 7
 ));
8 8
 
9
-$description = EEH_Form_Fields::prep_answer_options( array(
10
-	array( 'id' => 0, 'text' => __('none', 'event_espresso')),
11
-	array( 'id' => 1, 'text' => __('excerpt (short desc)', 'event_espresso')),
12
-	array( 'id' => 2, 'text' => __('full description', 'event_espresso'))
9
+$description = EEH_Form_Fields::prep_answer_options(array(
10
+	array('id' => 0, 'text' => __('none', 'event_espresso')),
11
+	array('id' => 1, 'text' => __('excerpt (short desc)', 'event_espresso')),
12
+	array('id' => 2, 'text' => __('full description', 'event_espresso'))
13 13
 ));
14 14
 
15 15
 ?>
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 			<tr>
28 28
 				<th>
29 29
 					<label for="event_listings_url">
30
-						<?php _e('Event Listings URL', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('event_listings_url_info');?>
30
+						<?php _e('Event Listings URL', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('event_listings_url_info'); ?>
31 31
 					</label>
32 32
 				</th>
33 33
 				<td>
@@ -42,13 +42,13 @@  discard block
 block discarded – undo
42 42
 					</label>
43 43
 				</th>
44 44
 				<td>
45
-					<p><?php echo site_url() . '/ ' . EEH_Form_Fields::text( 'not_used', EE_Registry::instance()->CFG->core->event_cpt_slug, 'event_cpt_slug', 'event_cpt_slug', 'regular' ); ?></p>
45
+					<p><?php echo site_url().'/ '.EEH_Form_Fields::text('not_used', EE_Registry::instance()->CFG->core->event_cpt_slug, 'event_cpt_slug', 'event_cpt_slug', 'regular'); ?></p>
46 46
 					<p class="description"><?php _e('This allows you to configure what slug is used for the url of all event pages.', 'event_espresso'); ?></p>
47
-					<?php if ( has_filter( 'FHEE__EE_Register_CPTs__register_CPT__rewrite' ) ) : ?>
47
+					<?php if (has_filter('FHEE__EE_Register_CPTs__register_CPT__rewrite')) : ?>
48 48
 						<p class="important-notice">
49 49
 							<?php
50 50
 							sprintf(
51
-								__( 'Usage of the %1$s FHEE__EE_Register_CPTs__register_CPT__rewrite %2$s filter has been detected.  Please be aware that while this filter is being used, this setting has no affect.', 'event_espresso' ),
51
+								__('Usage of the %1$s FHEE__EE_Register_CPTs__register_CPT__rewrite %2$s filter has been detected.  Please be aware that while this filter is being used, this setting has no affect.', 'event_espresso'),
52 52
 								'<code>',
53 53
 								'</code>'
54 54
 							);
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 					</label>
66 66
 				</th>
67 67
 				<td>
68
-				<?php echo EEH_Form_Fields::select( 'display_status_banner', $display_status_banner, $values, 'EED_Events_Archive_display_status_banner', 'EED_Events_Archive_display_status_banner' );?>
68
+				<?php echo EEH_Form_Fields::select('display_status_banner', $display_status_banner, $values, 'EED_Events_Archive_display_status_banner', 'EED_Events_Archive_display_status_banner'); ?>
69 69
 					<p class="description"><?php _e('Selecting "Yes" will inject an Event Status banner with the title whenever Events are displaying on the events archive page.', 'event_espresso'); ?></p>
70 70
 				</td>
71 71
 			</tr>
@@ -73,55 +73,55 @@  discard block
 block discarded – undo
73 73
 			<tr>
74 74
 				<th>
75 75
 					<label for="EED_Events_Archive_display_description">
76
-						<?php _e('Display Description', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_description_info');?>
76
+						<?php _e('Display Description', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_description_info'); ?>
77 77
 					</label>
78 78
 				</th>
79 79
 				<td>
80
-					<?php echo EEH_Form_Fields::select( 'description', $display_description, $description, 'EED_Events_Archive_display_description', 'EED_Events_Archive_display_description' );?>
80
+					<?php echo EEH_Form_Fields::select('description', $display_description, $description, 'EED_Events_Archive_display_description', 'EED_Events_Archive_display_description'); ?>
81 81
 				</td>
82 82
 			</tr>
83 83
 
84 84
 			<tr>
85 85
 				<th>
86 86
 					<label for="EED_Events_Archive_display_ticket_selector">
87
-						<?php _e('Display Ticket Selector', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_ticket_selector_info');?>
87
+						<?php _e('Display Ticket Selector', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_ticket_selector_info'); ?>
88 88
 					</label>
89 89
 				</th>
90 90
 				<td>
91
-					<?php echo EEH_Form_Fields::select( 'ticket_selector', $display_ticket_selector, $values, 'EED_Events_Archive_display_ticket_selector', 'EED_Events_Archive_display_ticket_selector' );?>
91
+					<?php echo EEH_Form_Fields::select('ticket_selector', $display_ticket_selector, $values, 'EED_Events_Archive_display_ticket_selector', 'EED_Events_Archive_display_ticket_selector'); ?>
92 92
 				</td>
93 93
 			</tr>
94 94
 
95 95
 			<tr>
96 96
 				<th>
97 97
 					<label for="EED_Events_Archive_display_datetimes">
98
-						<?php _e('Display Datetimes', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_datetimes_info');?>
98
+						<?php _e('Display Datetimes', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_datetimes_info'); ?>
99 99
 					</label>
100 100
 				</th>
101 101
 				<td>
102
-					<?php echo EEH_Form_Fields::select( 'venue_details', $display_datetimes, $values, 'EED_Events_Archive_display_datetimes', 'EED_Events_Archive_display_datetimes' );?>
102
+					<?php echo EEH_Form_Fields::select('venue_details', $display_datetimes, $values, 'EED_Events_Archive_display_datetimes', 'EED_Events_Archive_display_datetimes'); ?>
103 103
 				</td>
104 104
 			</tr>
105 105
 
106 106
 			<tr>
107 107
 				<th>
108 108
 					<label for="EED_Events_Archive_display_venue">
109
-						<?php _e('Display Venue Details', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_venue_details_info');?>
109
+						<?php _e('Display Venue Details', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_venue_details_info'); ?>
110 110
 					</label>
111 111
 				</th>
112 112
 				<td>
113
-					<?php echo EEH_Form_Fields::select( 'display_venue', $display_venue, $values, 'EED_Events_Archive_display_venue', 'EED_Events_Archive_display_venue' );?>
113
+					<?php echo EEH_Form_Fields::select('display_venue', $display_venue, $values, 'EED_Events_Archive_display_venue', 'EED_Events_Archive_display_venue'); ?>
114 114
 				</td>
115 115
 			</tr>
116 116
 
117 117
 			<tr>
118 118
 				<th>
119 119
 					<label for="EED_Events_Archive_display_expired_events">
120
-						<?php _e('Display Expired Events', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_expired_events_info');?>
120
+						<?php _e('Display Expired Events', 'event_espresso'); ?> <?php echo EEH_Template::get_help_tab_link('display_expired_events_info'); ?>
121 121
 					</label>
122 122
 				</th>
123 123
 				<td>
124
-					<?php echo EEH_Form_Fields::select( 'expired_events', $display_expired_events, $values, 'EED_Events_Archive_display_expired_events', 'EED_Events_Archive_display_expired_events' );?>
124
+					<?php echo EEH_Form_Fields::select('expired_events', $display_expired_events, $values, 'EED_Events_Archive_display_expired_events', 'EED_Events_Archive_display_expired_events'); ?>
125 125
 				</td>
126 126
 			</tr>
127 127
 
@@ -132,11 +132,11 @@  discard block
 block discarded – undo
132 132
 					</label>
133 133
 				</th>
134 134
 				<td>
135
-					<?php echo EEH_Form_Fields::select( 'use_sortable_display_order', $use_sortable_display_order, $values, 'EED_Events_Archive_use_sortable_display_order', 'EED_Events_Archive_use_sortable_display_order' );?>
135
+					<?php echo EEH_Form_Fields::select('use_sortable_display_order', $use_sortable_display_order, $values, 'EED_Events_Archive_use_sortable_display_order', 'EED_Events_Archive_use_sortable_display_order'); ?>
136 136
 					<p class="description ">
137 137
 						<?php
138 138
 						echo sprintf(
139
-							__( '%1$sPlease Note:%2$s%3$sIf you are currently using filters to customize the display order for elements within the Event Archive listings, then you do NOT activate this feature until those filters have been removed or disabled. If this feature is activated while still using such filters, duplicate event content such as the ticket selector, datetimes, or venue information could be displayed on the frontend of the site. Please verify that this is not the case after activating this feature.', 'event_espresso' ),
139
+							__('%1$sPlease Note:%2$s%3$sIf you are currently using filters to customize the display order for elements within the Event Archive listings, then you do NOT activate this feature until those filters have been removed or disabled. If this feature is activated while still using such filters, duplicate event content such as the ticket selector, datetimes, or venue information could be displayed on the frontend of the site. Please verify that this is not the case after activating this feature.', 'event_espresso'),
140 140
 							'<span class="important-notice">',
141 141
 							'</span>',
142 142
 							'<br />'
@@ -148,14 +148,14 @@  discard block
 block discarded – undo
148 148
 
149 149
 			<tr>
150 150
 				<th>
151
-					<?php _e( 'Display Order', 'event_espresso' ); ?><?php //echo EEH_Template::get_help_tab_link( 'event_archive_order_info' ); ?>
151
+					<?php _e('Display Order', 'event_espresso'); ?><?php //echo EEH_Template::get_help_tab_link( 'event_archive_order_info' ); ?>
152 152
 				</th>
153 153
 				<td>
154 154
 
155
-					<?php wp_nonce_field( 'espresso_update_event_archive_order', 'espresso_update_event_archive_order_nonce', false ); ?>
155
+					<?php wp_nonce_field('espresso_update_event_archive_order', 'espresso_update_event_archive_order_nonce', false); ?>
156 156
 					<?php echo $event_archive_display_order; ?>
157 157
 
158
-					<p class="description"><?php _e( 'Drag and Drop the above to determine the display order of the Event Description, Date and Times, Ticket Selector, and Venue Information on the event archive page.', 'event_espresso' ); ?></p>
158
+					<p class="description"><?php _e('Drag and Drop the above to determine the display order of the Event Description, Date and Times, Ticket Selector, and Venue Information on the event archive page.', 'event_espresso'); ?></p>
159 159
 
160 160
 				</td>
161 161
 			</tr>
@@ -163,11 +163,11 @@  discard block
 block discarded – undo
163 163
 			<tr>
164 164
 				<th>
165 165
 					<label for="EED_Events_Archive_reset_event_list_settings">
166
-						<?php _e( 'Reset Event List Settings', 'event_espresso' ); ?>
166
+						<?php _e('Reset Event List Settings', 'event_espresso'); ?>
167 167
 					</label>
168 168
 				</th>
169 169
 				<td>
170
-					<?php echo EEH_Form_Fields::select( 'reset_event_list_settings', 0, $values, 'EED_Events_Archive_reset_event_list_settings', 'EED_Events_Archive_reset_event_list_settings' ); ?>
170
+					<?php echo EEH_Form_Fields::select('reset_event_list_settings', 0, $values, 'EED_Events_Archive_reset_event_list_settings', 'EED_Events_Archive_reset_event_list_settings'); ?>
171 171
 				</td>
172 172
 			</tr>
173 173
 
Please login to merge, or discard this patch.
4_6_0_stages/EE_DMS_4_6_0_invoice_settings.dmsstage.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -27,7 +27,7 @@  discard block
 block discarded – undo
27 27
 	 * Just initializes the status of the migration
28 28
 	 */
29 29
 	public function __construct() {
30
-		$this->_pretty_name = __( 'Update Invoice Settings', 'event_espresso' );
30
+		$this->_pretty_name = __('Update Invoice Settings', 'event_espresso');
31 31
 		parent::__construct();
32 32
 	}
33 33
 
@@ -54,13 +54,13 @@  discard block
 block discarded – undo
54 54
 	 * @throws EE_Error
55 55
 	 * @return int number of items ACTUALLY migrated
56 56
 	 */
57
-	protected function _migration_step( $num_items = 1 ){
57
+	protected function _migration_step($num_items = 1) {
58 58
 
59 59
 		$templates_relative_path = 'modules/gateways/Invoice/lib/templates/';
60
-		$overridden_invoice_body = EEH_Template::locate_template( $templates_relative_path . 'invoice_body.template.php', NULL, FALSE, FALSE, TRUE );
61
-		$overridden_receipt_body= EEH_Template::locate_template( $templates_relative_path . 'receipt_body.template.php', NULL, FALSE, FALSE, TRUE );
62
-		if( $overridden_invoice_body || $overridden_receipt_body ) {
63
-			EE_Error::add_persistent_admin_notice( 'invoice_overriding_templates', sprintf( __( 'Note: in this version of Event Espresso, PDF and HTML Invoices and Receipts are now Messages and can be changed just like any other messages; however we noticed you had previously overriden the old default Invoice/Receipt templates. Because of this, your old Invoice/Receipt templates will continue to be used INSTEAD of the new Invoice/Receipt message equivalents (but this will be removed in an upcoming version). We recommend deleting your old Invoice/Receipt templates and using the new messages system. Then modify the new Invoice and Receipt messages\'s content in Messages -> Invoice and Messages -> Receipt.')), TRUE );
60
+		$overridden_invoice_body = EEH_Template::locate_template($templates_relative_path.'invoice_body.template.php', NULL, FALSE, FALSE, TRUE);
61
+		$overridden_receipt_body = EEH_Template::locate_template($templates_relative_path.'receipt_body.template.php', NULL, FALSE, FALSE, TRUE);
62
+		if ($overridden_invoice_body || $overridden_receipt_body) {
63
+			EE_Error::add_persistent_admin_notice('invoice_overriding_templates', sprintf(__('Note: in this version of Event Espresso, PDF and HTML Invoices and Receipts are now Messages and can be changed just like any other messages; however we noticed you had previously overriden the old default Invoice/Receipt templates. Because of this, your old Invoice/Receipt templates will continue to be used INSTEAD of the new Invoice/Receipt message equivalents (but this will be removed in an upcoming version). We recommend deleting your old Invoice/Receipt templates and using the new messages system. Then modify the new Invoice and Receipt messages\'s content in Messages -> Invoice and Messages -> Receipt.')), TRUE);
64 64
 		}
65 65
 
66 66
 		//regardless of whether it worked or not, we ought to continue the migration
Please login to merge, or discard this patch.
libraries/form_sections/base/EE_Form_Section_HTML_From_Template.form.php 2 patches
Spacing   +4 added lines, -4 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
 /**
@@ -25,9 +25,9 @@  discard block
 block discarded – undo
25 25
  *
26 26
  * ------------------------------------------------------------------------
27 27
  */
28
-class EE_Form_Section_HTML_From_Template extends EE_Form_Section_HTML{
29
-	public function __construct($template_file,$args = array(), $options_array = array()) {
30
-		$html = EEH_Template::locate_template( $template_file, $args );
28
+class EE_Form_Section_HTML_From_Template extends EE_Form_Section_HTML {
29
+	public function __construct($template_file, $args = array(), $options_array = array()) {
30
+		$html = EEH_Template::locate_template($template_file, $args);
31 31
 
32 32
 //		echo " filepath:$template_file html $html";
33 33
 		parent::__construct($html, $options_array);
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -1,7 +1,8 @@
 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
Please login to merge, or discard this patch.
core/libraries/form_sections/payment_methods/EE_Billing_Info_Form.form.php 1 patch
Spacing   +10 added lines, -10 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@  discard block
 block discarded – undo
1
-<?php if (!defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) { exit('No direct script access allowed'); }
2 2
 /**
3 3
  *
4 4
  * EE_Billing_Info_Form
@@ -11,7 +11,7 @@  discard block
 block discarded – undo
11 11
  * @author				Mike Nelson
12 12
  *
13 13
  */
14
-class EE_Billing_Info_Form extends EE_Form_Section_Proper{
14
+class EE_Billing_Info_Form extends EE_Form_Section_Proper {
15 15
 
16 16
 	/**
17 17
 	 * The payment method this billing form is for
@@ -26,10 +26,10 @@  discard block
 block discarded – undo
26 26
 	 * @param EE_Payment_Method $payment_method
27 27
 	 * @param array $options_array @see EE_Form_Section_Proper::__construct()
28 28
 	 */
29
-	public function __construct( EE_Payment_Method $payment_method, $options_array= array()){
29
+	public function __construct(EE_Payment_Method $payment_method, $options_array = array()) {
30 30
 		$this->_pm_instance = $payment_method;
31 31
 		$this->_layout_strategy = new EE_Div_Per_Section_Layout();
32
-		parent::__construct( $options_array );
32
+		parent::__construct($options_array);
33 33
 
34 34
 	}
35 35
 
@@ -40,7 +40,7 @@  discard block
 block discarded – undo
40 40
 	 * @param EE_Payment_Method $payment_method
41 41
 	 * @return void
42 42
 	 */
43
-	public function set_payment_method( EE_Payment_Method $payment_method ){
43
+	public function set_payment_method(EE_Payment_Method $payment_method) {
44 44
 		$this->_pm_instance = $payment_method;
45 45
 	}
46 46
 
@@ -50,7 +50,7 @@  discard block
 block discarded – undo
50 50
 	 * Returns the instance of the payment method this billing form is for
51 51
 	 * @return EE_Payment_Method
52 52
 	 */
53
-	public function payment_method(){
53
+	public function payment_method() {
54 54
 		return $this->_pm_instance;
55 55
 	}
56 56
 
@@ -60,10 +60,10 @@  discard block
 block discarded – undo
60 60
 	 * payment_fields_autofilled_notice_html
61 61
 	 * @return string
62 62
 	 */
63
-	public function payment_fields_autofilled_notice_html(){
63
+	public function payment_fields_autofilled_notice_html() {
64 64
 		return  new EE_Form_Section_HTML(
65 65
 			EEH_HTML::p(
66
-				apply_filters( 'FHEE__EE_Billing_Info_Form__payment_fields_autofilled_notice_html_text', __( 'Payment fields have been autofilled because you are in debug mode', 'event_espresso' )),
66
+				apply_filters('FHEE__EE_Billing_Info_Form__payment_fields_autofilled_notice_html_text', __('Payment fields have been autofilled because you are in debug mode', 'event_espresso')),
67 67
 				'',
68 68
 				'important-notice'
69 69
 			)
@@ -75,8 +75,8 @@  discard block
 block discarded – undo
75 75
 	/**
76 76
 	 * @return string
77 77
 	 */
78
-	public function html_class(){
79
-		return ! empty( $this->_html_class ) ? $this->_html_class . ' ee-billing-form' : 'ee-billing-form';
78
+	public function html_class() {
79
+		return ! empty($this->_html_class) ? $this->_html_class.' ee-billing-form' : 'ee-billing-form';
80 80
 	}
81 81
 
82 82
 
Please login to merge, or discard this patch.
core/libraries/messages/messenger/EE_Pdf_messenger.class.php 2 patches
Spacing   +25 added lines, -25 removed lines patch added patch discarded remove patch
@@ -6,7 +6,7 @@  discard block
 block discarded – undo
6 6
  * @package Event Espresso
7 7
  * @subpackage messages
8 8
  */
9
-if (!defined('EVENT_ESPRESSO_VERSION') )
9
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
10 10
 	exit('NO direct script access allowed');
11 11
 
12 12
 /**
@@ -20,7 +20,7 @@  discard block
 block discarded – undo
20 20
  * @subpackage		messages
21 21
  * @author			Darren Ethier
22 22
  */
23
-class EE_Pdf_messenger extends EE_messenger  {
23
+class EE_Pdf_messenger extends EE_messenger {
24 24
 
25 25
 
26 26
 	/**
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 	 * @see abstract declaration in EE_messenger for details.
66 66
 	 */
67 67
 	protected function _set_admin_pages() {
68
-		$this->admin_registered_pages = array( 'events_edit' => false );
68
+		$this->admin_registered_pages = array('events_edit' => false);
69 69
 	}
70 70
 
71 71
 
@@ -85,10 +85,10 @@  discard block
 block discarded – undo
85 85
 	protected function _set_validator_config() {
86 86
 		$this->_validator_config = array(
87 87
 			'subject' => array(
88
-				'shortcodes' => array('recipient_details', 'organization', 'event', 'ticket', 'venue', 'primary_registration_details', 'event_author', 'email','event_meta', 'recipient_list', 'transaction', 'datetime_list', 'datetime')
88
+				'shortcodes' => array('recipient_details', 'organization', 'event', 'ticket', 'venue', 'primary_registration_details', 'event_author', 'email', 'event_meta', 'recipient_list', 'transaction', 'datetime_list', 'datetime')
89 89
 				),
90 90
 			'content' => array(
91
-				'shortcodes' => array( 'recipient_details', 'organization', 'event', 'ticket', 'venue', 'primary_registration_details', 'event_author', 'email','event_meta', 'recipient_list', 'transaction', 'datetime_list', 'datetime')
91
+				'shortcodes' => array('recipient_details', 'organization', 'event', 'ticket', 'venue', 'primary_registration_details', 'event_author', 'email', 'event_meta', 'recipient_list', 'transaction', 'datetime_list', 'datetime')
92 92
 				),
93 93
 			'attendee_list' => array(
94 94
 				'shortcodes' => array('attendee', 'event_list', 'ticket_list'),
@@ -99,7 +99,7 @@  discard block
 block discarded – undo
99 99
 				'required' => array('[EVENT_LIST]')
100 100
 				),
101 101
 			'ticket_list' => array(
102
-				'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list','primary_registration_details', 'recipient_details'),
102
+				'shortcodes' => array('event_list', 'attendee_list', 'ticket', 'datetime_list', 'primary_registration_details', 'recipient_details'),
103 103
 				'required' => array('[TICKET_LIST]')
104 104
 				),
105 105
 			'datetime_list' => array(
@@ -119,7 +119,7 @@  discard block
 block discarded – undo
119 119
 	 */
120 120
 	public  function enqueue_scripts_styles() {
121 121
 		parent::enqueue_scripts_styles();
122
-		do_action( 'AHEE__EE_Pdf_messenger__enqueue_scripts_styles');
122
+		do_action('AHEE__EE_Pdf_messenger__enqueue_scripts_styles');
123 123
 	}
124 124
 
125 125
 
@@ -245,18 +245,18 @@  discard block
 block discarded – undo
245 245
 	 */
246 246
 	protected function _send_message() {
247 247
 		$this->_template_args = array(
248
-			'page_title' => html_entity_decode( stripslashes( $this->_subject ), ENT_QUOTES, "UTF-8"),
249
-			'base_css' => $this->get_variation( $this->_tmp_pack, $this->_incoming_message_type->name, TRUE, 'base', $this->_variation ),
250
-			'print_css' => $this->get_variation( $this->_tmp_pack, $this->_incoming_message_type->name, TRUE, 'print', $this->_variation ),
251
-			'main_css' => $this->get_variation( $this->_tmp_pack, $this->_incoming_message_type->name, TRUE, 'main', $this->_variation ),
252
-			'extra_css' => EE_LIBRARIES_URL . 'messages/defaults/default/variations/pdf_base_default.css',
253
-			'main_body' => apply_filters( 'FHEE__EE_Pdf_messenger___send_message__main_body', wpautop(stripslashes_deep( html_entity_decode($this->_content,  ENT_QUOTES,"UTF-8" ) )), $this->_content )
248
+			'page_title' => html_entity_decode(stripslashes($this->_subject), ENT_QUOTES, "UTF-8"),
249
+			'base_css' => $this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, TRUE, 'base', $this->_variation),
250
+			'print_css' => $this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, TRUE, 'print', $this->_variation),
251
+			'main_css' => $this->get_variation($this->_tmp_pack, $this->_incoming_message_type->name, TRUE, 'main', $this->_variation),
252
+			'extra_css' => EE_LIBRARIES_URL.'messages/defaults/default/variations/pdf_base_default.css',
253
+			'main_body' => apply_filters('FHEE__EE_Pdf_messenger___send_message__main_body', wpautop(stripslashes_deep(html_entity_decode($this->_content, ENT_QUOTES, "UTF-8"))), $this->_content)
254 254
 			);
255 255
 		$this->_deregister_wp_hooks();
256
-		add_action( 'wp_enqueue_scripts', array( $this, 'enqueue_scripts_styles' ) );
256
+		add_action('wp_enqueue_scripts', array($this, 'enqueue_scripts_styles'));
257 257
 		$content = $this->_get_main_template();
258 258
 //		die( $content );
259
-		$this->_do_pdf( $content );
259
+		$this->_do_pdf($content);
260 260
 		exit(0);
261 261
 	}
262 262
 
@@ -280,8 +280,8 @@  discard block
 block discarded – undo
280 280
 
281 281
 		//just add back in wp_enqueue_scripts and wp_print_footer_scripts cause that's all we want to load.
282 282
 		add_action('wp_head', 'wp_enqueue_scripts');
283
-		add_action( 'wp_footer', 'wp_print_footer_scripts' );
284
-		add_action( 'wp_print_footer_scripts', '_wp_footer_scripts' );
283
+		add_action('wp_footer', 'wp_print_footer_scripts');
284
+		add_action('wp_print_footer_scripts', '_wp_footer_scripts');
285 285
 	}
286 286
 
287 287
 
@@ -294,11 +294,11 @@  discard block
 block discarded – undo
294 294
 	 * @param bool $preview
295 295
 	 * @return string
296 296
 	 */
297
-	protected function _get_main_template( $preview = FALSE ) {
298
-		$wrapper_template = $this->_tmp_pack->get_wrapper( 'html', 'main' );
297
+	protected function _get_main_template($preview = FALSE) {
298
+		$wrapper_template = $this->_tmp_pack->get_wrapper('html', 'main');
299 299
 		//add message type to template_args
300 300
 		$this->_template_args['message_type'] = $this->_incoming_message_type;
301
-		return EEH_Template::display_template( $wrapper_template, $this->_template_args, TRUE );
301
+		return EEH_Template::display_template($wrapper_template, $this->_template_args, TRUE);
302 302
 	}
303 303
 
304 304
 
@@ -311,21 +311,21 @@  discard block
 block discarded – undo
311 311
 	 *
312 312
 	 * @return void
313 313
 	 */
314
-	protected function _do_pdf( $content = '' ) {
315
-		$invoice_name = html_entity_decode( $this->_subject, ENT_QUOTES, "UTF-8");
314
+	protected function _do_pdf($content = '') {
315
+		$invoice_name = html_entity_decode($this->_subject, ENT_QUOTES, "UTF-8");
316 316
 
317 317
 		//only load dompdf if nobody else has yet...
318
-		if( ! defined('DOMPDF_DIR')){
318
+		if ( ! defined('DOMPDF_DIR')) {
319 319
 			define('DOMPDF_ENABLE_REMOTE', TRUE);
320 320
 			define('DOMPDF_ENABLE_JAVASCRIPT', FALSE);
321 321
 			define('DOMPDF_ENABLE_CSS_FLOAT', TRUE);
322
-			require_once(EE_THIRD_PARTY . 'dompdf/dompdf_config.inc.php');
322
+			require_once(EE_THIRD_PARTY.'dompdf/dompdf_config.inc.php');
323 323
 		}
324 324
 		$dompdf = new DOMPDF();
325 325
 		$dompdf->load_html($content);
326 326
 		$dompdf->render();
327 327
 		//forcing the browser to open a download dialog.
328
-		$dompdf->stream($invoice_name . ".pdf", array( 'Attachment' => TRUE ));
328
+		$dompdf->stream($invoice_name.".pdf", array('Attachment' => TRUE));
329 329
 	}
330 330
 
331 331
 
Please login to merge, or discard this patch.
Braces   +2 added lines, -1 removed lines patch added patch discarded remove patch
@@ -6,8 +6,9 @@
 block discarded – undo
6 6
  * @package Event Espresso
7 7
  * @subpackage messages
8 8
  */
9
-if (!defined('EVENT_ESPRESSO_VERSION') )
9
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
10 10
 	exit('NO direct script access allowed');
11
+}
11 12
 
12 13
 /**
13 14
  *
Please login to merge, or discard this patch.
core/helpers/EEH_Address.helper.php 1 patch
Spacing   +18 added lines, -18 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 
3
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
4
-	exit( 'No direct script access allowed' );
3
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
4
+	exit('No direct script access allowed');
5 5
 }
6 6
 
7 7
 
@@ -35,24 +35,24 @@  discard block
 block discarded – undo
35 35
 		$add_wrapper = true
36 36
 	) {
37 37
 		// check that incoming object implements the EEI_Address interface
38
-		if ( ! $obj_with_address instanceof EEI_Address ) {
39
-			$msg = __( 'The address could not be formatted.', 'event_espresso' );
38
+		if ( ! $obj_with_address instanceof EEI_Address) {
39
+			$msg = __('The address could not be formatted.', 'event_espresso');
40 40
 			$dev_msg = __(
41 41
 				'The Address Formatter requires passed objects to implement the EEI_Address interface.',
42 42
 				'event_espresso'
43 43
 			);
44
-			EE_Error::add_error( $msg . '||' . $dev_msg, __FILE__, __FUNCTION__, __LINE__ );
44
+			EE_Error::add_error($msg.'||'.$dev_msg, __FILE__, __FUNCTION__, __LINE__);
45 45
 			return null;
46 46
 		}
47 47
 		// obtain an address formatter
48
-		$formatter = EEH_Address::_get_formatter( $type );
48
+		$formatter = EEH_Address::_get_formatter($type);
49 49
 		// apply schema.org formatting ?
50 50
 		$use_schema = ! is_admin() ? $use_schema : false;
51 51
 		$formatted_address = $use_schema
52
-			? EEH_Address::_schema_formatting( $formatter, $obj_with_address )
53
-			: EEH_Address::_regular_formatting( $formatter, $obj_with_address, $add_wrapper );
52
+			? EEH_Address::_schema_formatting($formatter, $obj_with_address)
53
+			: EEH_Address::_regular_formatting($formatter, $obj_with_address, $add_wrapper);
54 54
 		$formatted_address = $add_wrapper && ! $use_schema
55
-			? '<div class="espresso-address-dv">' . $formatted_address . '</div>'
55
+			? '<div class="espresso-address-dv">'.$formatted_address.'</div>'
56 56
 			: $formatted_address;
57 57
 		// return the formatted address
58 58
 		return $formatted_address;
@@ -67,8 +67,8 @@  discard block
 block discarded – undo
67 67
 	 * @param string $type how the address is formatted. for example: 'multiline' or 'inline'
68 68
 	 * @return EEI_Address_Formatter
69 69
 	 */
70
-	private static function _get_formatter( $type ) {
71
-		switch ( $type ) {
70
+	private static function _get_formatter($type) {
71
+		switch ($type) {
72 72
 			case 'multiline' :
73 73
 				return new EventEspresso\core\services\address\formatters\MultiLineAddressFormatter();
74 74
 			case 'inline' :
@@ -121,15 +121,15 @@  discard block
 block discarded – undo
121 121
 	 * @param object EEI_Address $obj_with_address
122 122
 	 * @return string
123 123
 	 */
124
-	private static function _schema_formatting( EEI_Address_Formatter $formatter, EEI_Address $obj_with_address ) {
124
+	private static function _schema_formatting(EEI_Address_Formatter $formatter, EEI_Address $obj_with_address) {
125 125
 		$formatted_address = '<div itemprop="address" itemscope itemtype="http://schema.org/PostalAddress">';
126 126
 		$formatted_address .= $formatter->format(
127
-			EEH_Schema::streetAddress( $obj_with_address ),
128
-			EEH_Schema::postOfficeBoxNumber( $obj_with_address ),
129
-			EEH_Schema::addressLocality( $obj_with_address ),
130
-			EEH_Schema::addressRegion( $obj_with_address ),
131
-			EEH_Schema::postalCode( $obj_with_address ),
132
-			EEH_Schema::addressCountry( $obj_with_address ),
127
+			EEH_Schema::streetAddress($obj_with_address),
128
+			EEH_Schema::postOfficeBoxNumber($obj_with_address),
129
+			EEH_Schema::addressLocality($obj_with_address),
130
+			EEH_Schema::addressRegion($obj_with_address),
131
+			EEH_Schema::postalCode($obj_with_address),
132
+			EEH_Schema::addressCountry($obj_with_address),
133 133
 			$obj_with_address->country_ID()
134 134
 		);
135 135
 		$formatted_address .= '</div>';
Please login to merge, or discard this patch.
core/db_classes/EE_CPT_Base.class.php 2 patches
Spacing   +56 added lines, -56 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1
-<?php if ( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
2
-	exit( 'No direct script access allowed' );
1
+<?php if ( ! defined('EVENT_ESPRESSO_VERSION')) {
2
+	exit('No direct script access allowed');
3 3
 }
4 4
 /**
5 5
  * Event Espresso
@@ -47,8 +47,8 @@  discard block
 block discarded – undo
47 47
 	 * @param int    $parent_term_taxonomy_id optional
48 48
 	 * @return EE_Term_Taxonomy
49 49
 	 */
50
-	function add_event_category( $category_name, $category_description = NULL, $parent_term_taxonomy_id = NULL ) {
51
-		return $this->get_model()->add_event_category( $this, $category_name, $category_description, $parent_term_taxonomy_id );
50
+	function add_event_category($category_name, $category_description = NULL, $parent_term_taxonomy_id = NULL) {
51
+		return $this->get_model()->add_event_category($this, $category_name, $category_description, $parent_term_taxonomy_id);
52 52
 	}
53 53
 
54 54
 
@@ -58,8 +58,8 @@  discard block
 block discarded – undo
58 58
 	 * @param string $category_name
59 59
 	 * @return bool
60 60
 	 */
61
-	function remove_event_category( $category_name ) {
62
-		return $this->get_model()->remove_event_category( $this, $category_name );
61
+	function remove_event_category($category_name) {
62
+		return $this->get_model()->remove_event_category($this, $category_name);
63 63
 	}
64 64
 
65 65
 
@@ -70,14 +70,14 @@  discard block
 block discarded – undo
70 70
 	 * @param EE_Term_Taxonomy $term_taxonomy
71 71
 	 * @return EE_Base_Class the relation was removed from
72 72
 	 */
73
-	function remove_relation_to_term_taxonomy( $term_taxonomy ) {
74
-		if ( !$term_taxonomy ) {
75
-			EE_Error::add_error( sprintf( __( "No Term_Taxonomy provided which to remove from model object of type %s and id %d", "event_espresso" ), get_class( $this ), $this->ID() ), __FILE__, __FUNCTION__, __LINE__ );
73
+	function remove_relation_to_term_taxonomy($term_taxonomy) {
74
+		if ( ! $term_taxonomy) {
75
+			EE_Error::add_error(sprintf(__("No Term_Taxonomy provided which to remove from model object of type %s and id %d", "event_espresso"), get_class($this), $this->ID()), __FILE__, __FUNCTION__, __LINE__);
76 76
 			return NULL;
77 77
 		}
78
-		$term_taxonomy->set_count( $term_taxonomy->count() - 1 );
78
+		$term_taxonomy->set_count($term_taxonomy->count() - 1);
79 79
 		$term_taxonomy->save();
80
-		return $this->_remove_relation_to( $term_taxonomy, 'Term_Taxonomy' );
80
+		return $this->_remove_relation_to($term_taxonomy, 'Term_Taxonomy');
81 81
 	}
82 82
 
83 83
 
@@ -101,7 +101,7 @@  discard block
 block discarded – undo
101 101
 	 * @return int
102 102
 	 */
103 103
 	public function parent() {
104
-		return $this->get( 'parent' );
104
+		return $this->get('parent');
105 105
 	}
106 106
 
107 107
 
@@ -111,7 +111,7 @@  discard block
 block discarded – undo
111 111
 	 * @return string
112 112
 	 */
113 113
 	public function status() {
114
-		return $this->get( 'status' );
114
+		return $this->get('status');
115 115
 	}
116 116
 
117 117
 
@@ -119,8 +119,8 @@  discard block
 block discarded – undo
119 119
 	/**
120 120
 	 * @param string $status
121 121
 	 */
122
-	public function set_status( $status ) {
123
-		$this->set( 'status', $status );
122
+	public function set_status($status) {
123
+		$this->set('status', $status);
124 124
 	}
125 125
 
126 126
 
@@ -134,12 +134,12 @@  discard block
 block discarded – undo
134 134
 	 * @param string|array $attr Optional. Query string or array of attributes.
135 135
 	 * @return string HTML image element
136 136
 	 */
137
-	protected function _get_feature_image( $size, $attr ) {
137
+	protected function _get_feature_image($size, $attr) {
138 138
 		//first let's see if we already have the _feature_image property set AND if it has a cached element on it FOR the given size
139
-		$attr_key = is_array( $attr ) ? implode( '_', $attr ) : $attr;
140
-		$cache_key = is_array( $size ) ? implode( '_', $size ) . $attr_key : $size . $attr_key;
141
-		$this->_feature_image[ $cache_key ] = isset( $this->_feature_image[ $cache_key ] ) ? $this->_feature_image[ $cache_key ] : $this->get_model()->get_feature_image( $this->ID(), $size, $attr );
142
-		return $this->_feature_image[ $cache_key ];
139
+		$attr_key = is_array($attr) ? implode('_', $attr) : $attr;
140
+		$cache_key = is_array($size) ? implode('_', $size).$attr_key : $size.$attr_key;
141
+		$this->_feature_image[$cache_key] = isset($this->_feature_image[$cache_key]) ? $this->_feature_image[$cache_key] : $this->get_model()->get_feature_image($this->ID(), $size, $attr);
142
+		return $this->_feature_image[$cache_key];
143 143
 	}
144 144
 
145 145
 
@@ -150,8 +150,8 @@  discard block
 block discarded – undo
150 150
 	 * @param string|array $attr
151 151
 	 * @return string of html
152 152
 	 */
153
-	public function feature_image( $size = 'thumbnail', $attr = '' ) {
154
-		return $this->_get_feature_image( $size, $attr );
153
+	public function feature_image($size = 'thumbnail', $attr = '') {
154
+		return $this->_get_feature_image($size, $attr);
155 155
 	}
156 156
 
157 157
 
@@ -161,9 +161,9 @@  discard block
 block discarded – undo
161 161
 	 * @param  string|array $size can either be a string: 'thumbnail', 'medium', 'large', 'full' OR 2-item array representing width and height in pixels eg. array(32,32).
162 162
 	 * @return string|boolean          the url of the image or false if not found
163 163
 	 */
164
-	public function feature_image_url( $size = 'thumbnail' ) {
165
-		$attachment = wp_get_attachment_image_src( get_post_thumbnail_id( $this->ID() ), $size );
166
-		return !empty( $attachment ) ? $attachment[ 0 ] : FALSE;
164
+	public function feature_image_url($size = 'thumbnail') {
165
+		$attachment = wp_get_attachment_image_src(get_post_thumbnail_id($this->ID()), $size);
166
+		return ! empty($attachment) ? $attachment[0] : FALSE;
167 167
 	}
168 168
 
169 169
 
@@ -185,36 +185,36 @@  discard block
 block discarded – undo
185 185
 	 *                                 This array is INDEXED by RELATED OBJ NAME (so it corresponds with the obj_names sent);
186 186
 	 * @return void
187 187
 	 */
188
-	public function restore_revision( $revision_id, $related_obj_names = array(), $where_query = array() ) {
188
+	public function restore_revision($revision_id, $related_obj_names = array(), $where_query = array()) {
189 189
 		//get revision object
190
-		$revision_obj = $this->get_model()->get_one_by_ID( $revision_id );
191
-		if ( $revision_obj instanceof EE_CPT_Base ) {
190
+		$revision_obj = $this->get_model()->get_one_by_ID($revision_id);
191
+		if ($revision_obj instanceof EE_CPT_Base) {
192 192
 			//no related_obj_name so we assume we're saving a revision on this object.
193
-			if ( empty( $related_obj_names ) ) {
193
+			if (empty($related_obj_names)) {
194 194
 				$fields = $this->get_model()->get_meta_table_fields();
195
-				foreach ( $fields as $field ) {
196
-					$this->set( $field, $revision_obj->get( $field ) );
195
+				foreach ($fields as $field) {
196
+					$this->set($field, $revision_obj->get($field));
197 197
 				}
198 198
 				$this->save();
199 199
 			}
200
-			$related_obj_names = (array)$related_obj_names;
201
-			foreach ( $related_obj_names as $related_name ) {
200
+			$related_obj_names = (array) $related_obj_names;
201
+			foreach ($related_obj_names as $related_name) {
202 202
 				//related_obj_name so we're saving a revision on an object related to this object
203 203
 				//do we have $where_query params for this related object?  If we do then we include that.
204
-				$cols_n_values = isset( $where_query[ $related_name ] ) ? $where_query[ $related_name ] : array();
205
-				$where_params = !empty( $cols_n_values ) ? array( $cols_n_values ) : array();
206
-				$related_objs = $this->get_many_related( $related_name, $where_params );
207
-				$revision_related_objs = $revision_obj->get_many_related( $related_name, $where_params );
204
+				$cols_n_values = isset($where_query[$related_name]) ? $where_query[$related_name] : array();
205
+				$where_params = ! empty($cols_n_values) ? array($cols_n_values) : array();
206
+				$related_objs = $this->get_many_related($related_name, $where_params);
207
+				$revision_related_objs = $revision_obj->get_many_related($related_name, $where_params);
208 208
 				//load helper
209 209
 				//remove related objs from this object that are not in revision
210 210
 				//array_diff *should* work cause I think objects are indexed by ID?
211
-				$related_to_remove = EEH_Array::object_array_diff( $related_objs, $revision_related_objs );
212
-				foreach ( $related_to_remove as $rr ) {
213
-					$this->_remove_relation_to( $rr, $related_name, $cols_n_values );
211
+				$related_to_remove = EEH_Array::object_array_diff($related_objs, $revision_related_objs);
212
+				foreach ($related_to_remove as $rr) {
213
+					$this->_remove_relation_to($rr, $related_name, $cols_n_values);
214 214
 				}
215 215
 				//add all related objs attached to revision to this object
216
-				foreach ( $revision_related_objs as $r_obj ) {
217
-					$this->_add_relation_to( $r_obj, $related_name, $cols_n_values );
216
+				foreach ($revision_related_objs as $r_obj) {
217
+					$this->_add_relation_to($r_obj, $related_name, $cols_n_values);
218 218
 				}
219 219
 			}
220 220
 		}
@@ -230,8 +230,8 @@  discard block
 block discarded – undo
230 230
 	 * <li>If $single is set to false, or left blank, the function returns an array containing all values of the specified key.</li>
231 231
 	 * <li>If $single is set to true, the function returns the first value of the specified key (not in an array</li></ul>
232 232
 	 */
233
-	public function get_post_meta( $meta_key = NULL, $single = FALSE ) {
234
-		return get_post_meta( $this->ID(), $meta_key, $single );
233
+	public function get_post_meta($meta_key = NULL, $single = FALSE) {
234
+		return get_post_meta($this->ID(), $meta_key, $single);
235 235
 	}
236 236
 
237 237
 
@@ -243,11 +243,11 @@  discard block
 block discarded – undo
243 243
 	 * @param mixed  $prev_value
244 244
 	 * @return mixed Returns meta_id if the meta doesn't exist, otherwise returns true on success and false on failure. NOTE: If the meta_value passed to this function is the same as the value that is already in the database, this function returns false.
245 245
 	 */
246
-	public function update_post_meta( $meta_key, $meta_value, $prev_value = NULL ) {
247
-		if ( ! $this->ID() ) {
246
+	public function update_post_meta($meta_key, $meta_value, $prev_value = NULL) {
247
+		if ( ! $this->ID()) {
248 248
 			$this->save();
249 249
 		}
250
-		return update_post_meta( $this->ID(), $meta_key, $meta_value, $prev_value );
250
+		return update_post_meta($this->ID(), $meta_key, $meta_value, $prev_value);
251 251
 	}
252 252
 
253 253
 
@@ -259,11 +259,11 @@  discard block
 block discarded – undo
259 259
 	 * @param bool  $unique . If postmeta for this $meta_key already exists, whether to add an additional item or not
260 260
 	 * @return boolean Boolean true, except if the $unique argument was set to true and a custom field with the given key already exists, in which case false is returned.
261 261
 	 */
262
-	public function add_post_meta( $meta_key, $meta_value, $unique = FALSE ) {
263
-		if ( $this->ID() ) {
262
+	public function add_post_meta($meta_key, $meta_value, $unique = FALSE) {
263
+		if ($this->ID()) {
264 264
 			$this->save();
265 265
 		}
266
-		return add_post_meta( $this->ID(), $meta_key, $meta_value, $unique );
266
+		return add_post_meta($this->ID(), $meta_key, $meta_value, $unique);
267 267
 	}
268 268
 
269 269
 
@@ -275,13 +275,13 @@  discard block
 block discarded – undo
275 275
 	 * @param mixed $meta_value
276 276
 	 * @return boolean False for failure. True for success.
277 277
 	 */
278
-	public function delete_post_meta( $meta_key, $meta_value = '' ) {
279
-		if ( ! $this->ID() ) {
278
+	public function delete_post_meta($meta_key, $meta_value = '') {
279
+		if ( ! $this->ID()) {
280 280
 			//there are obviously no postmetas for this if it's not saved
281 281
 			//so let's just report this as a success
282 282
 			return true;
283 283
 		}
284
-		return delete_post_meta( $this->ID(), $meta_key, $meta_value );
284
+		return delete_post_meta($this->ID(), $meta_key, $meta_value);
285 285
 	}
286 286
 
287 287
 
@@ -291,7 +291,7 @@  discard block
 block discarded – undo
291 291
 	 * @return string
292 292
 	 */
293 293
 	public function get_permalink() {
294
-		return get_permalink( $this->ID() );
294
+		return get_permalink($this->ID());
295 295
 	}
296 296
 
297 297
 
@@ -301,8 +301,8 @@  discard block
 block discarded – undo
301 301
 	 * @param array $query_params
302 302
 	 * @return EE_Term_Taxonomy
303 303
 	 */
304
-	public function term_taxonomies( $query_params = array() ) {
305
-		return $this->get_many_related( 'Term_Taxonomy', $query_params );
304
+	public function term_taxonomies($query_params = array()) {
305
+		return $this->get_many_related('Term_Taxonomy', $query_params);
306 306
 	}
307 307
 
308 308
 
Please login to merge, or discard this patch.
Doc Comments   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -130,7 +130,7 @@  discard block
 block discarded – undo
130 130
 	 *
131 131
 	 * @link   http://codex.wordpress.org/Function_Reference/get_the_post_thumbnail
132 132
 	 * @access protected
133
-	 * @param string|array $size (optional) Image size. Defaults to 'post-thumbnail' but can also be a 2-item array representing width and height in pixels (i.e. array(32,32) ).
133
+	 * @param string $size (optional) Image size. Defaults to 'post-thumbnail' but can also be a 2-item array representing width and height in pixels (i.e. array(32,32) ).
134 134
 	 * @param string|array $attr Optional. Query string or array of attributes.
135 135
 	 * @return string HTML image element
136 136
 	 */
@@ -172,7 +172,7 @@  discard block
 block discarded – undo
172 172
 	 * This is a method for restoring this_obj using details from the given $revision_id
173 173
 	 *
174 174
 	 * @param int $revision_id 		ID of the revision we're getting data from
175
-	 * @param array $related_obj_names if included this will be used to restore for related obj
175
+	 * @param string[] $related_obj_names if included this will be used to restore for related obj
176 176
 	 *                                 if not included then we just do restore on the meta.
177 177
 	 *                                 We will accept an array of related_obj_names for restoration here.
178 178
 	 * @param array $where_query       You can optionally include an array of key=>value pairs
@@ -226,7 +226,7 @@  discard block
 block discarded – undo
226 226
 	 * Wrapper for get_post_meta, http://codex.wordpress.org/Function_Reference/get_post_meta
227 227
 	 * @param string  $meta_key
228 228
 	 * @param boolean $single
229
-	 * @return mixed <ul><li>If only $id is set it will return all meta values in an associative array.</li>
229
+	 * @return string|null <ul><li>If only $id is set it will return all meta values in an associative array.</li>
230 230
 	 * <li>If $single is set to false, or left blank, the function returns an array containing all values of the specified key.</li>
231 231
 	 * <li>If $single is set to true, the function returns the first value of the specified key (not in an array</li></ul>
232 232
 	 */
@@ -254,8 +254,8 @@  discard block
 block discarded – undo
254 254
 
255 255
 	/**
256 256
 	 * Wrapper for add_post_meta, http://codex.wordpress.org/Function_Reference/add_post_meta
257
-	 * @param mixed $meta_key
258
-	 * @param mixed $meta_value
257
+	 * @param string $meta_key
258
+	 * @param string $meta_value
259 259
 	 * @param bool  $unique . If postmeta for this $meta_key already exists, whether to add an additional item or not
260 260
 	 * @return boolean Boolean true, except if the $unique argument was set to true and a custom field with the given key already exists, in which case false is returned.
261 261
 	 */
@@ -271,7 +271,7 @@  discard block
 block discarded – undo
271 271
 	/**
272 272
 	 * Wrapper for delete_post_meta, http://codex.wordpress.org/Function_Reference/delete_post_meta
273 273
 	 *
274
-	 * @param mixed $meta_key
274
+	 * @param string $meta_key
275 275
 	 * @param mixed $meta_value
276 276
 	 * @return boolean False for failure. True for success.
277 277
 	 */
@@ -299,7 +299,7 @@  discard block
 block discarded – undo
299 299
 	/**
300 300
 	 * Gets all the term-taxonomies for this CPT
301 301
 	 * @param array $query_params
302
-	 * @return EE_Term_Taxonomy
302
+	 * @return EE_Base_Class[]
303 303
 	 */
304 304
 	public function term_taxonomies( $query_params = array() ) {
305 305
 		return $this->get_many_related( 'Term_Taxonomy', $query_params );
Please login to merge, or discard this patch.