Completed
Branch BUG-11107-submit-button-text (11bd3b)
by
unknown
30:51 queued 19:49
created
core/EE_Object_Repository.core.php 1 patch
Spacing   +15 added lines, -15 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
  * Class EE_Object_Repository
@@ -38,9 +38,9 @@  discard block
 block discarded – undo
38 38
 	 * @param array $arguments	arrays of arguments that will be passed to the object's callback method
39 39
 	 * @return bool | int
40 40
 	 */
41
-	protected function _call_user_func_array_on_current( $callback = '', $arguments = array() ) {
42
-		if ( $callback !== '' && method_exists( $this->current(), $callback ) ) {
43
-			return call_user_func_array( array( $this->current(), $callback ), $arguments );
41
+	protected function _call_user_func_array_on_current($callback = '', $arguments = array()) {
42
+		if ($callback !== '' && method_exists($this->current(), $callback)) {
43
+			return call_user_func_array(array($this->current(), $callback), $arguments);
44 44
 		}
45 45
 		return false;
46 46
 	}
@@ -56,13 +56,13 @@  discard block
 block discarded – undo
56 56
 	 * @param string $callback  name of method found on repository objects to be called
57 57
 	 * @return bool | int
58 58
 	 */
59
-	protected function _call_user_func_on_all( $callback = '' ) {
59
+	protected function _call_user_func_on_all($callback = '') {
60 60
 		$success = true;
61
-		if ( $this->valid() ) {
61
+		if ($this->valid()) {
62 62
 			$this->rewind();
63
-			while ( $this->valid() ) {
63
+			while ($this->valid()) {
64 64
 				// any negative result will toggle success to false
65
-				$success = $this->_call_user_func_array_on_current( $callback ) ? $success : false;
65
+				$success = $this->_call_user_func_array_on_current($callback) ? $success : false;
66 66
 				$this->next();
67 67
 			}
68 68
 			$this->rewind();
@@ -86,9 +86,9 @@  discard block
 block discarded – undo
86 86
 	 * @param array 	$persistence_arguments	arrays of arguments that will be passed to the object's persistence method
87 87
 	 * @return bool | int
88 88
 	 */
89
-	public function persist( $persistence_callback = '', $persistence_arguments = array() ) {
90
-		$persistence_callback = ! empty( $persistence_callback ) ? $persistence_callback : $this->persist_method;
91
-		return $this->_call_user_func_array_on_current( $persistence_callback, $persistence_arguments );
89
+	public function persist($persistence_callback = '', $persistence_arguments = array()) {
90
+		$persistence_callback = ! empty($persistence_callback) ? $persistence_callback : $this->persist_method;
91
+		return $this->_call_user_func_array_on_current($persistence_callback, $persistence_arguments);
92 92
 	}
93 93
 
94 94
 
@@ -102,9 +102,9 @@  discard block
 block discarded – undo
102 102
 	 * @param string 	$persistence_callback 		name of method found on object that can be used for persisting the object
103 103
 	 * @return bool | int
104 104
 	 */
105
-	public function persist_all( $persistence_callback = '' ) {
106
-		$persistence_callback = ! empty( $persistence_callback ) ? $persistence_callback : $this->persist_method;
107
-		return $this->_call_user_func_on_all( $persistence_callback );
105
+	public function persist_all($persistence_callback = '') {
106
+		$persistence_callback = ! empty($persistence_callback) ? $persistence_callback : $this->persist_method;
107
+		return $this->_call_user_func_on_all($persistence_callback);
108 108
 	}
109 109
 
110 110
 
Please login to merge, or discard this patch.
core/admin/EE_Help_Tour_final_stop.class.php 2 patches
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,5 +1,5 @@  discard block
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if ( ! defined('EVENT_ESPRESSO_VERSION'))
3 3
 	exit('NO direct script access allowed');
4 4
 
5 5
 /**
@@ -60,7 +60,7 @@  discard block
 block discarded – undo
60 60
 			'action' => 'admin_option_settings',
61 61
 			'page' => 'espresso_general_settings'
62 62
 			);
63
-		return '<p>' . sprintf( __('That\'s it for the tour!  At any time you can restart a tour by clicking on this help dropdown and then clicking one of the Tour buttons.  There are help tours available on all Event Espresso Admin pages.  If you want to turn off help tours for all pages, %sgo here%s. All the best with your events!', 'event_espresso'), '<a href="' . EE_Admin_Page::add_query_args_and_nonce($query_args, admin_url('admin.php') ) . '">', '</a>' ) . '</p>';
63
+		return '<p>'.sprintf(__('That\'s it for the tour!  At any time you can restart a tour by clicking on this help dropdown and then clicking one of the Tour buttons.  There are help tours available on all Event Espresso Admin pages.  If you want to turn off help tours for all pages, %sgo here%s. All the best with your events!', 'event_espresso'), '<a href="'.EE_Admin_Page::add_query_args_and_nonce($query_args, admin_url('admin.php')).'">', '</a>').'</p>';
64 64
 	}
65 65
 
66 66
 }
67 67
\ 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,6 +1,7 @@
 block discarded – undo
1 1
 <?php
2
-if (!defined('EVENT_ESPRESSO_VERSION') )
2
+if (!defined('EVENT_ESPRESSO_VERSION') ) {
3 3
 	exit('NO direct script access allowed');
4
+}
4 5
 
5 6
 /**
6 7
  * Event Espresso
Please login to merge, or discard this patch.
core/admin/templates/about_admin_wrapper.template.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -1,16 +1,16 @@
 block discarded – undo
1 1
 <div class="wrap espresso-admin about-wrap">
2 2
 
3 3
 	<h1><?php  echo $admin_page_title; ?></h1>
4
-	<div class="about-text"><?php echo !empty($admin_page_subtitle) ? $admin_page_subtitle : ''; ?></div>
5
-	<div class="ee-badge"><img class="" src=" <?php echo EE_GLOBAL_ASSETS_URL; ?>images/event-espresso-cup-90x90.png" width="90" height="90" alt="<?php printf( esc_attr__( '%s Logo', 'event_espresso' ), 'Event Espresso' ); ?>"/><br /><?php printf( __('Version %s', 'event_espresso' ),  EVENT_ESPRESSO_VERSION ); ?></div>
4
+	<div class="about-text"><?php echo ! empty($admin_page_subtitle) ? $admin_page_subtitle : ''; ?></div>
5
+	<div class="ee-badge"><img class="" src=" <?php echo EE_GLOBAL_ASSETS_URL; ?>images/event-espresso-cup-90x90.png" width="90" height="90" alt="<?php printf(esc_attr__('%s Logo', 'event_espresso'), 'Event Espresso'); ?>"/><br /><?php printf(__('Version %s', 'event_espresso'), EVENT_ESPRESSO_VERSION); ?></div>
6 6
 
7 7
 	<?php echo $nav_tabs; ?>
8 8
 
9 9
 
10 10
 <?php
11
-	do_action( 'AHEE__admin_wrapper__template__before_about_admin_page_content' );
11
+	do_action('AHEE__admin_wrapper__template__before_about_admin_page_content');
12 12
 	echo $about_admin_page_content;
13
-	do_action( 'AHEE__admin_wrapper__template__after_about_admin_page_content' );
13
+	do_action('AHEE__admin_wrapper__template__after_about_admin_page_content');
14 14
 ?>
15 15
 
16 16
 </div>
Please login to merge, or discard this patch.
core/admin/templates/admin_details_metabox_column_wrapper.template.php 1 patch
Spacing   +4 added lines, -4 removed lines patch added patch discarded remove patch
@@ -10,13 +10,13 @@
 block discarded – undo
10 10
 
11 11
 		<?php
12 12
 		//let's loop through the columns
13
-		 for ( $i = 1; $i <= $num_columns; $i++ ) {
14
-		 	$metaref = ( $i === 1 ) ? 'normal' : 'side';
15
-		 	$metaref = ( $i > 2 ) ? 'column'.$i : $metaref;
13
+		 for ($i = 1; $i <= $num_columns; $i++) {
14
+		 	$metaref = ($i === 1) ? 'normal' : 'side';
15
+		 	$metaref = ($i > 2) ? 'column'.$i : $metaref;
16 16
 		 ?>
17 17
 
18 18
 			<div id='postbox-container-<?php echo $i; ?>' class='postbox-container'>
19
-				<?php do_meta_boxes( $current_page, $metaref, NULL ); ?>
19
+				<?php do_meta_boxes($current_page, $metaref, NULL); ?>
20 20
 			</div>
21 21
 		<?php }// end column loop ?>
22 22
 	</div> <!-- post-body -->
Please login to merge, or discard this patch.
core/admin/templates/admin_details_publish_metabox.template.php 1 patch
Spacing   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -1,4 +1,4 @@  discard block
 block discarded – undo
1
-<?php if ( $publish_box_extra_content ) : ?>
1
+<?php if ($publish_box_extra_content) : ?>
2 2
 <div id="minor-publishing">
3 3
 <?php echo $publish_box_extra_content; ?>
4 4
 </div>
@@ -13,7 +13,7 @@  discard block
 block discarded – undo
13 13
 	
14 14
 	<div id="espresso_major_buttons_wrapper">
15 15
 	
16
-		<?php if ( $publish_delete_link ) : ?>
16
+		<?php if ($publish_delete_link) : ?>
17 17
 		<div id="delete-action">
18 18
 			<?php echo $publish_delete_link; ?>
19 19
 		</div>
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_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/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.