Completed
Branch ENH-9001-hhvm-max-input-vars (e4c045)
by
unknown
423:23 queued 406:35
created
core/admin/templates/admin_details_wrapper.template.php 1 patch
Spacing   +5 added lines, -5 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 global $post_type, $post;
3 3
 //action for registering metaboxes
4
-do_action( 'add_meta_boxes', $post_type, $post );
4
+do_action('add_meta_boxes', $post_type, $post);
5 5
 ?>
6 6
 <div id="admin-page-header">
7 7
 	<?php echo $admin_page_header; ?>
@@ -10,7 +10,7 @@  discard block
 block discarded – undo
10 10
 		<!-- admin-page-header -->
11 11
 	<div id="post-body" class="metabox-holder columns-2">
12 12
 
13
-	<?php if ( ! empty( $post_body_content )) : ?>
13
+	<?php if ( ! empty($post_body_content)) : ?>
14 14
 		<div id="post-body-content">
15 15
 			<?php echo $post_body_content; ?>
16 16
 		</div>
@@ -18,13 +18,13 @@  discard block
 block discarded – undo
18 18
 	<?php endif; ?>
19 19
 
20 20
 		<div id="postbox-container-1" class="postbox-container">
21
-			<?php do_meta_boxes( $current_page, 'side', NULL ); ?>
21
+			<?php do_meta_boxes($current_page, 'side', NULL); ?>
22 22
 		</div>
23 23
 		<!-- postbox-container-1 -->
24 24
 
25 25
 		<div id="postbox-container-2" class="postbox-container">
26
-			<?php do_meta_boxes( $current_page, 'normal', NULL ); ?>
27
-			<?php do_meta_boxes( $current_page, 'advanced', NULL ); ?>
26
+			<?php do_meta_boxes($current_page, 'normal', NULL); ?>
27
+			<?php do_meta_boxes($current_page, 'advanced', NULL); ?>
28 28
 		</div>
29 29
 		<!-- postbox-container-2 -->
30 30
 
Please login to merge, or discard this patch.
help_tabs/payment_methods_overview_paypalstandard.help_tab.php 1 patch
Spacing   +8 added lines, -8 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@  discard block
 block discarded – undo
3 3
 <?php _e('Adjust the settings for the PayPal Standard payment gateway.', 'event_espresso'); ?>
4 4
 </p>
5 5
 <p>
6
-<?php printf( __( 'See %1$shere%2$s for list of currencies supported by Paypal Standard.', 'event_espresso' ), "<a href='https://www.paypal.com/multicurrency' target='_blank'>","</a>" ); ?>
6
+<?php printf(__('See %1$shere%2$s for list of currencies supported by Paypal Standard.', 'event_espresso'), "<a href='https://www.paypal.com/multicurrency' target='_blank'>", "</a>"); ?>
7 7
 </p>
8 8
 <h3><?php _e('PayPal Standard Settings', 'event_espresso'); ?></h3>
9 9
 <ul>
@@ -21,18 +21,18 @@  discard block
 block discarded – undo
21 21
 </li>
22 22
 <li>
23 23
 <strong><?php _e('PayPal Calculates Taxes', 'event_espresso'); ?></strong><br />
24
-<?php printf( __('If set to "Yes", we will indicate to PayPal that it should calculate the taxes on the order and add it. This means PayPal\'s tax calculations will be used on the order instead of Event Espresso\'s. %1$sRead here for more information.%2$s', 'event_espresso'), "<a href='https://www.paypal.com/ca/cgi-bin/webscr?cmd=xpt/Marketing/shipping/EasyCalculateShipAndTax-outside' target='_blank'>", '</a>' ); ?><br/>
25
-<?php _e( 'Note: It may confuse users if Event Espresso initially calculates taxes on the order, and then they go to PayPal and it calculates taxes differently. So it is recommended that if PayPal is calculating taxes, that you do not set any taxes in Event Espresso.', 'event_espresso' );?>
24
+<?php printf(__('If set to "Yes", we will indicate to PayPal that it should calculate the taxes on the order and add it. This means PayPal\'s tax calculations will be used on the order instead of Event Espresso\'s. %1$sRead here for more information.%2$s', 'event_espresso'), "<a href='https://www.paypal.com/ca/cgi-bin/webscr?cmd=xpt/Marketing/shipping/EasyCalculateShipAndTax-outside' target='_blank'>", '</a>'); ?><br/>
25
+<?php _e('Note: It may confuse users if Event Espresso initially calculates taxes on the order, and then they go to PayPal and it calculates taxes differently. So it is recommended that if PayPal is calculating taxes, that you do not set any taxes in Event Espresso.', 'event_espresso'); ?>
26 26
 </li>
27 27
 <li>
28 28
 <strong><?php _e('PayPal Calculates Shipping', 'event_espresso'); ?></strong><br />
29 29
 <?php _e('Similar to the "PayPal Calculates Taxes" setting, if this is set to "Yes", we will indicate to PayPal that it should calculate the shipping on each payment (if there are multiple payments for a single transaction, PayPal is permitted to add shipping charges to each payment.)', 'event_espresso'); ?><br/>
30
-<?php _e( 'Important Note: PayPal will ONLY calculate shipping on an order if "Shipping Address Options" is set to "Prompt for an Address" (otherwise how will PayPal know how much to charge for shipping if it doesn\'t know where it\'s shipping to?)', 'event_espresso' );?>
30
+<?php _e('Important Note: PayPal will ONLY calculate shipping on an order if "Shipping Address Options" is set to "Prompt for an Address" (otherwise how will PayPal know how much to charge for shipping if it doesn\'t know where it\'s shipping to?)', 'event_espresso'); ?>
31 31
 <li>
32
-<strong><?php _e( 'Notes Regarding Paypal Taxes and Shipping', 'event_espresso' );?></strong><br/>
33
-<?php _e( 'If you want PayPal to calculate taxes and shipping on an order, those changes will NOT appear during the initial registration process until the user is redirected to PayPal for payment.', 'event_espresso' );?><br/>
34
-<?php _e( 'However, after the user has returned from PayPal, their order in Event Espresso will be updated with the new taxes and added shipping charges (e.g. it will appear on their receipt.)', 'event_espresso' );?><br/>
35
-<?php _e( 'Also Note: In order for PayPal to properly calculate taxes and shipping, they need to receive the entire order at the same time. So if a user goes to make a payment using PayPal, and their order somehow already has a payment on it, PayPal CANNOT calculate taxes or shipping on that order.', 'event_espresso' );?>
32
+<strong><?php _e('Notes Regarding Paypal Taxes and Shipping', 'event_espresso'); ?></strong><br/>
33
+<?php _e('If you want PayPal to calculate taxes and shipping on an order, those changes will NOT appear during the initial registration process until the user is redirected to PayPal for payment.', 'event_espresso'); ?><br/>
34
+<?php _e('However, after the user has returned from PayPal, their order in Event Espresso will be updated with the new taxes and added shipping charges (e.g. it will appear on their receipt.)', 'event_espresso'); ?><br/>
35
+<?php _e('Also Note: In order for PayPal to properly calculate taxes and shipping, they need to receive the entire order at the same time. So if a user goes to make a payment using PayPal, and their order somehow already has a payment on it, PayPal CANNOT calculate taxes or shipping on that order.', 'event_espresso'); ?>
36 36
 </li>
37 37
 <li>
38 38
 <strong><?php _e('Shipping Address Options', 'event_espresso'); ?></strong><br />
Please login to merge, or discard this patch.
core/db_models/strategies/EE_CPT_Where_Conditions.strategy.php 2 patches
Doc Comments   +4 added lines, -1 removed lines patch added patch discarded remove patch
@@ -7,6 +7,10 @@  discard block
 block discarded – undo
7 7
 
8 8
 	protected $_post_type;
9 9
 	protected $_meta_field;
10
+
11
+	/**
12
+	 * @param string $post_type
13
+	 */
10 14
 	function __construct($post_type, $meta_field_to_chk = ''){
11 15
 		$this->_post_type = $post_type;
12 16
 		$this->_meta_field = $meta_field_to_chk;
@@ -27,7 +31,6 @@  discard block
 block discarded – undo
27 31
 	}
28 32
 	/**
29 33
 	 * Gets the where default where conditions for a custom post type model
30
-	 * @param string $model_relation_path. Eg, from Event to Payment, this should be "Registration.Transaction.Payment"
31 34
 	 * @return array like EEM_Base::get_all's $query_params's index [0] (where conditions)
32 35
 	 */
33 36
 	protected function _get_default_where_conditions() {
Please login to merge, or discard this patch.
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -3,11 +3,11 @@  discard block
 block discarded – undo
3 3
 /*
4 4
  * Strategy specifically for adding where conditions specific to CPT models.
5 5
  */
6
-class EE_CPT_Where_Conditions extends EE_Default_Where_Conditions{
6
+class EE_CPT_Where_Conditions extends EE_Default_Where_Conditions {
7 7
 
8 8
 	protected $_post_type;
9 9
 	protected $_meta_field;
10
-	function __construct($post_type, $meta_field_to_chk = ''){
10
+	function __construct($post_type, $meta_field_to_chk = '') {
11 11
 		$this->_post_type = $post_type;
12 12
 		$this->_meta_field = $meta_field_to_chk;
13 13
 	}
@@ -17,10 +17,10 @@  discard block
 block discarded – undo
17 17
 	 * @param string $column column name
18 18
 	 * @return EE_Model_Field_Base
19 19
 	 */
20
-	protected function _get_field_on_column($column){
20
+	protected function _get_field_on_column($column) {
21 21
 		$all_fields = $this->_model->field_settings(true);
22
-		foreach($all_fields as $field_name => $field_obj){
23
-			if($column == $field_obj->get_table_column()){
22
+		foreach ($all_fields as $field_name => $field_obj) {
23
+			if ($column == $field_obj->get_table_column()) {
24 24
 				return $field_obj;
25 25
 			}
26 26
 		}
@@ -34,8 +34,8 @@  discard block
 block discarded – undo
34 34
 		//find post_type field
35 35
 		$post_type_field = $this->_get_field_on_column('post_type');
36 36
 		$status_field = $this->_get_field_on_column('post_status');
37
-		return array( $post_type_field->get_name() => $this->_post_type,
38
-				$status_field->get_name() => array('NOT IN',array('auto-draft','trash'))
37
+		return array($post_type_field->get_name() => $this->_post_type,
38
+				$status_field->get_name() => array('NOT IN', array('auto-draft', 'trash'))
39 39
 		);
40 40
 	}
41 41
 }
Please login to merge, or discard this patch.