Completed
Branch old/BUG-7514-7935-7936-price-o... (518ae6)
by
unknown
25:14 queued 22:51
created
Paypal_Standard/templates/paypal_standard_settings_before_form.template.php 3 patches
Indentation   +21 added lines, -21 removed lines patch added patch discarded remove patch
@@ -3,27 +3,27 @@
 block discarded – undo
3 3
 if (!defined('EVENT_ESPRESSO_VERSION'))
4 4
 	exit('No direct script access allowed');
5 5
 /**
6
- * Event Espresso
7
- *
8
- * Event Registration and Management Plugin for WordPress
9
- *
10
- * @ package			Event Espresso
11
- * @ author			Seth Shoultes
12
- * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
13
- * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
14
- * @ link					http://www.eventespresso.com
15
- * @ version		 	4.3
16
- *
17
- * ------------------------------------------------------------------------
18
- *
19
- * paypal_standard_settings_before_form
20
- *
21
- * @package			Event Espresso
22
- * @subpackage		
23
- * @author				Mike Nelson
24
- *
25
- * ------------------------------------------------------------------------
26
- */
6
+	 * Event Espresso
7
+	 *
8
+	 * Event Registration and Management Plugin for WordPress
9
+	 *
10
+	 * @ package			Event Espresso
11
+	 * @ author			Seth Shoultes
12
+	 * @ copyright		(c) 2008-2011 Event Espresso  All Rights Reserved.
13
+	 * @ license			http://eventespresso.com/support/terms-conditions/   * see Plugin Licensing *
14
+	 * @ link					http://www.eventespresso.com
15
+	 * @ version		 	4.3
16
+	 *
17
+	 * ------------------------------------------------------------------------
18
+	 *
19
+	 * paypal_standard_settings_before_form
20
+	 *
21
+	 * @package			Event Espresso
22
+	 * @subpackage		
23
+	 * @author				Mike Nelson
24
+	 *
25
+	 * ------------------------------------------------------------------------
26
+	 */
27 27
 ?>
28 28
 <strong style="color:#F00"><?php _e('Please Note:','event_espresso')?></strong> <?php		_e("You will need a PayPal Premier or Business account for the PayPal IPN to work correctly.	", 'event_espresso');	
29 29
 
Please login to merge, or discard this patch.
Spacing   +2 added lines, -2 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
  * Event Espresso
@@ -25,7 +25,7 @@  discard block
 block discarded – undo
25 25
  * ------------------------------------------------------------------------
26 26
  */
27 27
 ?>
28
-<strong style="color:#F00"><?php _e('Please Note:','event_espresso')?></strong> <?php		_e("You will need a PayPal Premier or Business account for the PayPal IPN to work correctly.	", 'event_espresso');	
28
+<strong style="color:#F00"><?php _e('Please Note:', 'event_espresso')?></strong> <?php		_e("You will need a PayPal Premier or Business account for the PayPal IPN to work correctly.	", 'event_espresso');	
29 29
 
30 30
 
31 31
 // End of file paypal_standard_settings_before_form.template.php
32 32
\ No newline at end of file
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
  * Event Espresso
7 8
  *
Please login to merge, or discard this patch.
public/Espresso_Arabica_2014/archive-espresso_events.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,11 +16,11 @@
 block discarded – undo
16 16
 
17 17
 	<section id="primary" class="content-area">
18 18
 		<div id="content" class="site-content" role="main">
19
-			<?php espresso_get_template_part( 'loop', 'espresso_events' ); ?>			
19
+			<?php espresso_get_template_part('loop', 'espresso_events'); ?>			
20 20
 		</div><!-- #content -->
21 21
 	</section><!-- #primary -->
22 22
 
23 23
 <?php
24
-get_sidebar( 'content' );
24
+get_sidebar('content');
25 25
 get_sidebar();
26 26
 get_footer();
Please login to merge, or discard this patch.
public/Espresso_Arabica_2014/archive-espresso_venues.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -18,11 +18,11 @@
 block discarded – undo
18 18
 
19 19
 	<section id="primary" class="content-area">
20 20
 		<div id="content" class="site-content" role="main">
21
-			<?php espresso_get_template_part( 'loop', 'espresso_venues' ); ?>			
21
+			<?php espresso_get_template_part('loop', 'espresso_venues'); ?>			
22 22
 		</div><!-- #content -->
23 23
 	</section><!-- #primary -->
24 24
 
25 25
 <?php
26
-get_sidebar( 'content' );
26
+get_sidebar('content');
27 27
 get_sidebar();
28 28
 get_footer();
29 29
\ No newline at end of file
Please login to merge, or discard this patch.
public/Espresso_Arabica_2014/content-espresso_events-datetimes.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,15 +1,15 @@
 block discarded – undo
1 1
 <?php
2 2
 //echo '<br/><h6 style="color:#2EA2CC;">'. __FILE__ . ' &nbsp; <span style="font-weight:normal;color:#E76700"> Line #: ' . __LINE__ . '</span></h6>';
3 3
 
4
-if ( is_single() || is_archive() && espresso_display_datetimes_in_event_list() ) :
4
+if (is_single() || is_archive() && espresso_display_datetimes_in_event_list()) :
5 5
 global $post;
6
-do_action( 'AHEE_event_details_before_event_date', $post );
6
+do_action('AHEE_event_details_before_event_date', $post);
7 7
 ?>
8 8
 	<div class="event-datetimes">
9
-		<?php espresso_list_of_event_dates( $post->ID );?>
9
+		<?php espresso_list_of_event_dates($post->ID); ?>
10 10
 	</div>
11 11
 	<!-- .event-datetimes -->
12 12
 <?php
13
-do_action( 'AHEE_event_details_after_event_date', $post );
13
+do_action('AHEE_event_details_after_event_date', $post);
14 14
 endif;
15 15
 ?>
16 16
\ No newline at end of file
Please login to merge, or discard this patch.
public/Espresso_Arabica_2014/content-espresso_events-details.php 1 patch
Spacing   +11 added lines, -11 removed lines patch added patch discarded remove patch
@@ -3,29 +3,29 @@
 block discarded – undo
3 3
 global $post;
4 4
 ?>
5 5
 <div class="event-content">
6
-<?php if ( apply_filters( 'FHEE__content_espresso_events_details_template__display_entry_meta', TRUE )): ?>
6
+<?php if (apply_filters('FHEE__content_espresso_events_details_template__display_entry_meta', TRUE)): ?>
7 7
 	<div class="entry-meta">
8
-		<span class="tags-links"><?php espresso_event_categories( $post->ID, TRUE, TRUE ); ?></span>
8
+		<span class="tags-links"><?php espresso_event_categories($post->ID, TRUE, TRUE); ?></span>
9 9
 	<?php
10
-		if ( ! post_password_required() && ( comments_open() || get_comments_number() ) ) :
10
+		if ( ! post_password_required() && (comments_open() || get_comments_number())) :
11 11
 	?>
12
-	<span class="comments-link"><?php comments_popup_link( __( 'Leave a comment', 'event_espresso' ), __( '1 Comment', 'event_espresso' ), __( '% Comments', 'event_espresso' ) ); ?></span>
12
+	<span class="comments-link"><?php comments_popup_link(__('Leave a comment', 'event_espresso'), __('1 Comment', 'event_espresso'), __('% Comments', 'event_espresso')); ?></span>
13 13
 	<?php
14 14
 		endif;
15
-		edit_post_link( __( 'Edit', 'event_espresso' ), '<span class="edit-link">', '</span>' );
15
+		edit_post_link(__('Edit', 'event_espresso'), '<span class="edit-link">', '</span>');
16 16
 	?>
17 17
 	</div>
18 18
 <?php endif;
19
-	$event_phone = espresso_event_phone( $post->ID, FALSE );
20
-	if ( $event_phone != '' ) : ?>
19
+	$event_phone = espresso_event_phone($post->ID, FALSE);
20
+	if ($event_phone != '') : ?>
21 21
 	<p>
22
-		<span class="small-text"><strong><?php _e( 'Event Phone:', 'event_espresso' ); ?> </strong></span> <?php echo $event_phone; ?>
22
+		<span class="small-text"><strong><?php _e('Event Phone:', 'event_espresso'); ?> </strong></span> <?php echo $event_phone; ?>
23 23
 	</p>
24
-<?php endif;  ?>
24
+<?php endif; ?>
25 25
 <?php
26
-	do_action( 'AHEE_event_details_before_the_content', $post );
26
+	do_action('AHEE_event_details_before_the_content', $post);
27 27
 	espresso_event_content_or_excerpt();
28
-	do_action( 'AHEE_event_details_after_the_content', $post );
28
+	do_action('AHEE_event_details_after_the_content', $post);
29 29
  ?>
30 30
 </div>
31 31
 <!-- .event-content -->
Please login to merge, or discard this patch.
public/Espresso_Arabica_2014/content-espresso_events-header.php 2 patches
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -3,12 +3,12 @@
 block discarded – undo
3 3
 global $post;
4 4
 ?>
5 5
 <header class="event-header">
6
-	<?php if ( is_single() ) : ?>
6
+	<?php if (is_single()) : ?>
7 7
 	<h1 id="event-details-h1-<?php echo $post->ID; ?>" class="entry-title">
8 8
 	<?php else : ?>
9 9
 	<h2 id="event-details-h2-<?php echo $post->ID; ?>" class="entry-title">
10 10
 	<?php endif; ?>
11 11
 		<a class="" href="<?php the_permalink(); ?>"><?php the_title(); ?></a>
12
-	<?php if ( is_single() ) : ?></h1><?php else : ?></h2><?php endif; ?>
13
-	<?php if ( ! is_archive() && has_excerpt( $post->ID )): the_excerpt(); endif;?>
12
+	<?php if (is_single()) : ?></h1><?php else : ?></h2><?php endif; ?>
13
+	<?php if ( ! is_archive() && has_excerpt($post->ID)): the_excerpt(); endif; ?>
14 14
 </header>
Please login to merge, or discard this patch.
Braces   +9 added lines, -3 removed lines patch added patch discarded remove patch
@@ -5,10 +5,16 @@
 block discarded – undo
5 5
 <header class="event-header">
6 6
 	<?php if ( is_single() ) : ?>
7 7
 	<h1 id="event-details-h1-<?php echo $post->ID; ?>" class="entry-title">
8
-	<?php else : ?>
9
-	<h2 id="event-details-h2-<?php echo $post->ID; ?>" class="entry-title">
8
+	<?php else {
9
+	: ?>
10
+	<h2 id="event-details-h2-<?php echo $post->ID;
11
+}
12
+?>" class="entry-title">
10 13
 	<?php endif; ?>
11 14
 		<a class="" href="<?php the_permalink(); ?>"><?php the_title(); ?></a>
12
-	<?php if ( is_single() ) : ?></h1><?php else : ?></h2><?php endif; ?>
15
+	<?php if ( is_single() ) : ?></h1><?php else {
16
+	: ?></h2><?php endif;
17
+}
18
+?>
13 19
 	<?php if ( ! is_archive() && has_excerpt( $post->ID )): the_excerpt(); endif;?>
14 20
 </header>
Please login to merge, or discard this patch.
public/Espresso_Arabica_2014/content-espresso_events-thumbnail.php 1 patch
Spacing   +6 added lines, -6 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 //echo '<br/><h6 style="color:#2EA2CC;">'. __FILE__ . ' &nbsp; <span style="font-weight:normal;color:#E76700"> Line #: ' . __LINE__ . '</span></h6>';
3 3
 global $post; 
4
-do_action( 'AHEE_event_details_before_featured_img', $post ); 
4
+do_action('AHEE_event_details_before_featured_img', $post); 
5 5
 
6
-if ( has_post_thumbnail( $post->ID )) :
7
-	if ( $img_ID = get_post_thumbnail_id( $post->ID )) :
8
-		if ( $featured_img = wp_get_attachment_image_src( $img_ID, 'large' )) :
9
-			$caption = esc_attr( get_post( get_post( $img_ID ))->post_excerpt );
6
+if (has_post_thumbnail($post->ID)) :
7
+	if ($img_ID = get_post_thumbnail_id($post->ID)) :
8
+		if ($featured_img = wp_get_attachment_image_src($img_ID, 'large')) :
9
+			$caption = esc_attr(get_post(get_post($img_ID))->post_excerpt);
10 10
 			?>
11 11
 <div id="ee-event-img-dv-<?php echo $post->ID; ?>" class="ee-event-img-dv">
12 12
 	<a class="" href="<?php the_permalink(); ?>">
@@ -18,4 +18,4 @@  discard block
 block discarded – undo
18 18
 	endif;
19 19
 endif;
20 20
 ?>		
21
-<?php do_action( 'AHEE_event_details_after_featured_img', $post );?>
21
+<?php do_action('AHEE_event_details_after_featured_img', $post); ?>
Please login to merge, or discard this patch.
public/Espresso_Arabica_2014/content-espresso_events-tickets.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,12 +1,12 @@
 block discarded – undo
1 1
 <?php
2 2
 //echo '<br/><h6 style="color:#2EA2CC;">'. __FILE__ . ' &nbsp; <span style="font-weight:normal;color:#E76700"> Line #: ' . __LINE__ . '</span></h6>';
3 3
 global $post;
4
-if ( espresso_display_ticket_selector( $post->ID ) && ( is_single() || ( is_archive() && espresso_display_ticket_selector_in_event_list() ))) :
4
+if (espresso_display_ticket_selector($post->ID) && (is_single() || (is_archive() && espresso_display_ticket_selector_in_event_list()))) :
5 5
 ?>
6 6
 <div class="event-tickets" style="clear: both;">
7
-	<?php espresso_ticket_selector( $post ); ?>
7
+	<?php espresso_ticket_selector($post); ?>
8 8
 </div>
9 9
 <!-- .event-tickets -->
10
-<?php elseif ( ! is_single() ) : ?>
11
-<?php espresso_view_details_btn( $post ); ?>
10
+<?php elseif ( ! is_single()) : ?>
11
+<?php espresso_view_details_btn($post); ?>
12 12
 <?php endif; ?>
13 13
\ No newline at end of file
Please login to merge, or discard this patch.
public/Espresso_Arabica_2014/content-espresso_events-venues.php 2 patches
Spacing   +27 added lines, -27 removed lines patch added patch discarded remove patch
@@ -1,54 +1,54 @@
 block discarded – undo
1 1
 <?php
2 2
 //echo '<br/><h6 style="color:#2EA2CC;">'. __FILE__ . ' &nbsp; <span style="font-weight:normal;color:#E76700"> Line #: ' . __LINE__ . '</span></h6>';
3
-if (( is_single() && espresso_display_venue_in_event_details() ) || ( is_archive() && espresso_display_venue_in_event_list() ) ) :
3
+if ((is_single() && espresso_display_venue_in_event_details()) || (is_archive() && espresso_display_venue_in_event_list())) :
4 4
 	global $post;
5
-	do_action( 'AHEE_event_details_before_venue_details', $post );
6
-	$venue_name = espresso_venue_name( 0, 'details', FALSE );
7
-	if ( empty( $venue_name ) && espresso_is_venue_private() ) {
8
-		do_action( 'AHEE_event_details_after_venue_details', $post );
5
+	do_action('AHEE_event_details_before_venue_details', $post);
6
+	$venue_name = espresso_venue_name(0, 'details', FALSE);
7
+	if (empty($venue_name) && espresso_is_venue_private()) {
8
+		do_action('AHEE_event_details_after_venue_details', $post);
9 9
 		return '';
10 10
 	}
11 11
 ?>
12 12
 
13 13
 <div class="espresso-venue-dv<?php echo espresso_is_venue_private() ? ' espresso-private-venue-dv' : ''; ?>">
14 14
 	<h3 class="event-venues-h3 ee-event-h3">
15
-		<span class="ee-icon ee-icon-venue"></span><?php _e( 'Event Location', 'event_espresso' ); ?>
15
+		<span class="ee-icon ee-icon-venue"></span><?php _e('Event Location', 'event_espresso'); ?>
16 16
 	</h3>
17
-	<h4><strong><?php _e( 'Venue:', 'event_espresso' ); ?></strong>&nbsp;&nbsp; <strong> <?php echo $venue_name; ?></strong></h4>
17
+	<h4><strong><?php _e('Venue:', 'event_espresso'); ?></strong>&nbsp;&nbsp; <strong> <?php echo $venue_name; ?></strong></h4>
18 18
 	<p><span class="smaller-text tags-links"><?php echo espresso_venue_categories(); ?></span></p>
19
-<?php  if ( $venue_phone = espresso_venue_phone( $post->ID, FALSE )) : ?>
19
+<?php  if ($venue_phone = espresso_venue_phone($post->ID, FALSE)) : ?>
20 20
 	<p>
21
-		<span class="small-text"><strong><?php _e( 'Venue Phone:', 'event_espresso' ); ?></strong></span> <?php echo $venue_phone; ?>
21
+		<span class="small-text"><strong><?php _e('Venue Phone:', 'event_espresso'); ?></strong></span> <?php echo $venue_phone; ?>
22 22
 	</p>
23
-<?php endif;  ?>
24
-<?php  if ( espresso_venue_has_address( $post->ID )) : ?>
25
-	<strong><span class="dashicons dashicons-location-alt"></span><?php _e( 'Address:', 'event_espresso' ); ?></strong>
26
-	<?php espresso_venue_address( 'inline' ); ?>
27
-	<?php espresso_venue_gmap( $post->ID ); ?>
23
+<?php endif; ?>
24
+<?php  if (espresso_venue_has_address($post->ID)) : ?>
25
+	<strong><span class="dashicons dashicons-location-alt"></span><?php _e('Address:', 'event_espresso'); ?></strong>
26
+	<?php espresso_venue_address('inline'); ?>
27
+	<?php espresso_venue_gmap($post->ID); ?>
28 28
 	<div class="clear"><br/></div>
29
-<?php endif;  ?>
29
+<?php endif; ?>
30 30
 
31
-	<?php $VNU_ID = espresso_venue_id( $post->ID ); ?>
32
-	<?php if ( is_single() ) : ?>
33
-		<?php $venue_description = espresso_venue_description( $VNU_ID, FALSE ); ?>
34
-		<?php if ( $venue_description ) : ?>
31
+	<?php $VNU_ID = espresso_venue_id($post->ID); ?>
32
+	<?php if (is_single()) : ?>
33
+		<?php $venue_description = espresso_venue_description($VNU_ID, FALSE); ?>
34
+		<?php if ($venue_description) : ?>
35 35
 	<p>
36
-		<strong><?php _e( 'Description:', 'event_espresso' ); ?></strong><br/>
36
+		<strong><?php _e('Description:', 'event_espresso'); ?></strong><br/>
37 37
 		<?php echo $venue_description; ?>
38 38
 	</p>
39
-		<?php endif;  ?>
39
+		<?php endif; ?>
40 40
 	<?php else : ?>
41
-		<?php $venue_excerpt = espresso_venue_excerpt( $VNU_ID, FALSE ); ?>
42
-		<?php if ( $venue_excerpt ) : ?>
41
+		<?php $venue_excerpt = espresso_venue_excerpt($VNU_ID, FALSE); ?>
42
+		<?php if ($venue_excerpt) : ?>
43 43
 	<p>
44
-		<strong><?php _e( 'Description:', 'event_espresso' ); ?></strong><br/>
44
+		<strong><?php _e('Description:', 'event_espresso'); ?></strong><br/>
45 45
 		<?php echo $venue_excerpt; ?>
46 46
 	</p>
47
-			<?php endif;  ?>
48
-		<?php endif;  ?>
47
+			<?php endif; ?>
48
+		<?php endif; ?>
49 49
 </div>
50 50
 <!-- .espresso-venue-dv -->
51 51
 <?php
52
-do_action( 'AHEE_event_details_after_venue_details', $post );
52
+do_action('AHEE_event_details_after_venue_details', $post);
53 53
 endif;
54 54
 ?>
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -37,8 +37,11 @@
 block discarded – undo
37 37
 		<?php echo $venue_description; ?>
38 38
 	</p>
39 39
 		<?php endif;  ?>
40
-	<?php else : ?>
41
-		<?php $venue_excerpt = espresso_venue_excerpt( $VNU_ID, FALSE ); ?>
40
+	<?php else {
41
+	: ?>
42
+		<?php $venue_excerpt = espresso_venue_excerpt( $VNU_ID, FALSE );
43
+}
44
+?>
42 45
 		<?php if ( $venue_excerpt ) : ?>
43 46
 	<p>
44 47
 		<strong><?php _e( 'Description:', 'event_espresso' ); ?></strong><br/>
Please login to merge, or discard this patch.