Completed
Branch BUG-9715-shortcode-resources (0cf20f)
by
unknown
695:33 queued 678:11
created
core/libraries/rest_api/Rest_Exception.php 1 patch
Spacing   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -13,8 +13,8 @@  discard block
 block discarded – undo
13 13
  * @since		 	   $VID:$
14 14
  *
15 15
  */
16
-if( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
17
-	exit( 'No direct script access allowed' );
16
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
17
+	exit('No direct script access allowed');
18 18
 }
19 19
 
20 20
 class Rest_Exception extends \EE_Error {
@@ -24,7 +24,7 @@  discard block
 block discarded – undo
24 24
 	 */
25 25
 	protected $_wp_error_data = array();
26 26
 	protected $_wp_error_code = '';
27
-	public function __construct( $string_code, $message, $wp_error_data = array(), $previous = null ) {
27
+	public function __construct($string_code, $message, $wp_error_data = array(), $previous = null) {
28 28
 		parent::__construct( 
29 29
 			$message,
30 30
 			500,
Please login to merge, or discard this patch.
core/EE_Bootstrap.core.php 1 patch
Spacing   +19 added lines, -19 removed lines patch added patch discarded remove patch
@@ -42,13 +42,13 @@  discard block
 block discarded – undo
42 42
 
43 43
 	public function __construct() {
44 44
 		// construct request stack and run middleware apps as soon as all WP plugins are loaded
45
-		add_action( 'plugins_loaded', array( $this, 'run_request_stack' ), 0 );
45
+		add_action('plugins_loaded', array($this, 'run_request_stack'), 0);
46 46
 		// set framework for the rest of EE to hook into when loading
47
-		add_action( 'plugins_loaded', array( 'EE_Bootstrap', 'load_espresso_addons' ), 1 );
48
-		add_action( 'plugins_loaded', array( 'EE_Bootstrap', 'detect_activations_or_upgrades' ), 3 );
49
-		add_action( 'plugins_loaded', array( 'EE_Bootstrap', 'load_core_configuration' ), 5 );
50
-		add_action( 'plugins_loaded', array( 'EE_Bootstrap', 'register_shortcodes_modules_and_widgets' ), 7 );
51
-		add_action( 'plugins_loaded', array( 'EE_Bootstrap', 'brew_espresso' ), 9 );
47
+		add_action('plugins_loaded', array('EE_Bootstrap', 'load_espresso_addons'), 1);
48
+		add_action('plugins_loaded', array('EE_Bootstrap', 'detect_activations_or_upgrades'), 3);
49
+		add_action('plugins_loaded', array('EE_Bootstrap', 'load_core_configuration'), 5);
50
+		add_action('plugins_loaded', array('EE_Bootstrap', 'register_shortcodes_modules_and_widgets'), 7);
51
+		add_action('plugins_loaded', array('EE_Bootstrap', 'brew_espresso'), 9);
52 52
 	}
53 53
 
54 54
 
@@ -65,7 +65,7 @@  discard block
 block discarded – undo
65 65
 			new EE_Load_Espresso_Core()
66 66
 		);
67 67
 		$this->_request_stack->handle_request(
68
-			new EE_Request( $_GET, $_POST, $_COOKIE ),
68
+			new EE_Request($_GET, $_POST, $_COOKIE),
69 69
 			new EE_Response()
70 70
 		);
71 71
 		$this->_request_stack->handle_response();
@@ -78,7 +78,7 @@  discard block
 block discarded – undo
78 78
 	 */
79 79
 	protected function load_autoloader() {
80 80
 		// load interfaces
81
-		espresso_load_required( 'EEH_Autoloader', EE_CORE . 'helpers' . DS . 'EEH_Autoloader.helper.php' );
81
+		espresso_load_required('EEH_Autoloader', EE_CORE.'helpers'.DS.'EEH_Autoloader.helper.php');
82 82
 		EEH_Autoloader::instance();
83 83
 	}
84 84
 
@@ -89,13 +89,13 @@  discard block
 block discarded – undo
89 89
 	 */
90 90
 	protected function set_autoloaders_for_required_files() {
91 91
 		// load interfaces
92
-		espresso_load_required( 'EEI_Interfaces', EE_CORE . 'interfaces' . DS . 'EEI_Interfaces.php' );
92
+		espresso_load_required('EEI_Interfaces', EE_CORE.'interfaces'.DS.'EEI_Interfaces.php');
93 93
 		// load helpers
94
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_HELPERS );
94
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_HELPERS);
95 95
 		// load request stack
96
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_CORE . 'request_stack' . DS );
96
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE.'request_stack'.DS);
97 97
 		// load middleware
98
-		EEH_Autoloader::register_autoloaders_for_each_file_in_folder( EE_CORE . 'middleware' . DS );
98
+		EEH_Autoloader::register_autoloaders_for_each_file_in_folder(EE_CORE.'middleware'.DS);
99 99
 	}
100 100
 
101 101
 
@@ -118,9 +118,9 @@  discard block
 block discarded – undo
118 118
 			)
119 119
 		);
120 120
 		// load middleware onto stack : FILO (First In Last Out)
121
-		foreach ( (array)$stack_apps as $stack_app ) {
121
+		foreach ((array) $stack_apps as $stack_app) {
122 122
 			//$request_stack_builder->push( $stack_app );
123
-			$request_stack_builder->unshift( $stack_app );
123
+			$request_stack_builder->unshift($stack_app);
124 124
 		}
125 125
 		return apply_filters(
126 126
 			'FHEE__EE_Bootstrap__build_request_stack__request_stack_builder',
@@ -137,7 +137,7 @@  discard block
 block discarded – undo
137 137
 	 * no other logic should be performed at this point
138 138
 	 */
139 139
 	public static function load_espresso_addons() {
140
-		do_action( 'AHEE__EE_Bootstrap__load_espresso_addons' );
140
+		do_action('AHEE__EE_Bootstrap__load_espresso_addons');
141 141
 	}
142 142
 
143 143
 
@@ -149,7 +149,7 @@  discard block
 block discarded – undo
149 149
 	 * we can determine if anything needs activating or upgrading
150 150
 	 */
151 151
 	public static function detect_activations_or_upgrades() {
152
-		do_action( 'AHEE__EE_Bootstrap__detect_activations_or_upgrades' );
152
+		do_action('AHEE__EE_Bootstrap__detect_activations_or_upgrades');
153 153
 	}
154 154
 
155 155
 
@@ -161,7 +161,7 @@  discard block
 block discarded – undo
161 161
 	 * we can load and set all of the system configurations
162 162
 	 */
163 163
 	public static function load_core_configuration() {
164
-		do_action( 'AHEE__EE_Bootstrap__load_core_configuration' );
164
+		do_action('AHEE__EE_Bootstrap__load_core_configuration');
165 165
 	}
166 166
 
167 167
 
@@ -173,7 +173,7 @@  discard block
 block discarded – undo
173 173
 	 * so that they are ready to be used throughout the system
174 174
 	 */
175 175
 	public static function register_shortcodes_modules_and_widgets() {
176
-		do_action( 'AHEE__EE_Bootstrap__register_shortcodes_modules_and_widgets' );
176
+		do_action('AHEE__EE_Bootstrap__register_shortcodes_modules_and_widgets');
177 177
 	}
178 178
 
179 179
 
@@ -185,7 +185,7 @@  discard block
 block discarded – undo
185 185
 	 * so let the fun begin...
186 186
 	 */
187 187
 	public static function brew_espresso() {
188
-		do_action( 'AHEE__EE_Bootstrap__brew_espresso' );
188
+		do_action('AHEE__EE_Bootstrap__brew_espresso');
189 189
 	}
190 190
 
191 191
 
Please login to merge, or discard this patch.
core/libraries/rest_api/calculations/Datetime.php 1 patch
Spacing   +28 added lines, -28 removed lines patch added patch discarded remove patch
@@ -15,8 +15,8 @@  discard block
 block discarded – undo
15 15
  * @since		 	   $VID:$
16 16
  *
17 17
  */
18
-if( !defined( 'EVENT_ESPRESSO_VERSION' ) ) {
19
-	exit( 'No direct script access allowed' );
18
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
19
+	exit('No direct script access allowed');
20 20
 }
21 21
 
22 22
 class Datetime extends Calculations_Base {
@@ -32,20 +32,20 @@  discard block
 block discarded – undo
32 32
 	 * @return int
33 33
 	 * @throws \EE_Error
34 34
 	 */
35
-	public static function spaces_remaining_considering_tickets( $wpdb_row, $request, $controller ){
36
-		if( is_array( $wpdb_row ) && isset( $wpdb_row[ 'Datetime.DTT_ID' ] ) ) {
37
-			$dtt_obj = \EEM_Datetime::instance()->get_one_by_ID( $wpdb_row[ 'Datetime.DTT_ID' ] );
35
+	public static function spaces_remaining_considering_tickets($wpdb_row, $request, $controller) {
36
+		if (is_array($wpdb_row) && isset($wpdb_row['Datetime.DTT_ID'])) {
37
+			$dtt_obj = \EEM_Datetime::instance()->get_one_by_ID($wpdb_row['Datetime.DTT_ID']);
38 38
 		} else {
39 39
 			$dtt_obj = null;
40 40
 		}
41
-		if( $dtt_obj instanceof \EE_Datetime ) {
42
-			return $dtt_obj->spaces_remaining( true );
41
+		if ($dtt_obj instanceof \EE_Datetime) {
42
+			return $dtt_obj->spaces_remaining(true);
43 43
 		} else {
44 44
 			throw new \EE_Error(
45 45
 				sprintf(
46
-					__( 'Cannot calculate spaces_remaining_considering_tickets because the datetime with ID %1$s (from database row %2$s) was not found', 'event_espresso' ),
47
-					$wpdb_row[ 'Datetime.DTT_ID' ],
48
-					print_r( $wpdb_row, true )
46
+					__('Cannot calculate spaces_remaining_considering_tickets because the datetime with ID %1$s (from database row %2$s) was not found', 'event_espresso'),
47
+					$wpdb_row['Datetime.DTT_ID'],
48
+					print_r($wpdb_row, true)
49 49
 				)
50 50
 			);
51 51
 		}
@@ -63,17 +63,17 @@  discard block
 block discarded – undo
63 63
 	 * @throws \EE_Error
64 64
 	 * @throws \EventEspresso\core\libraries\rest_api\Rest_Exception
65 65
 	 */
66
-	public static function registrations_checked_in_count( $wpdb_row, $request, $controller ){
67
-		if( ! is_array( $wpdb_row ) || ! isset( $wpdb_row[ 'Datetime.DTT_ID' ] ) ) {
66
+	public static function registrations_checked_in_count($wpdb_row, $request, $controller) {
67
+		if ( ! is_array($wpdb_row) || ! isset($wpdb_row['Datetime.DTT_ID'])) {
68 68
 			throw new \EE_Error(
69 69
 				sprintf(
70
-					__( 'Cannot calculate registrations_checked_in_count because the database row %1$s does not have an entry for "Datetime.DTT_ID"', 'event_espresso' ),
71
-					print_r( $wpdb_row, true )
70
+					__('Cannot calculate registrations_checked_in_count because the database row %1$s does not have an entry for "Datetime.DTT_ID"', 'event_espresso'),
71
+					print_r($wpdb_row, true)
72 72
 				)
73 73
 			);
74 74
 		}
75
-		self::_verify_current_user_can( 'ee_read_checkins', 'registrations_checked_in_count' );
76
-		return \EEM_Registration::instance()->count_registrations_checked_into_datetime( $wpdb_row[ 'Datetime.DTT_ID' ], true );
75
+		self::_verify_current_user_can('ee_read_checkins', 'registrations_checked_in_count');
76
+		return \EEM_Registration::instance()->count_registrations_checked_into_datetime($wpdb_row['Datetime.DTT_ID'], true);
77 77
 	}
78 78
 
79 79
 
@@ -88,17 +88,17 @@  discard block
 block discarded – undo
88 88
 	 * @throws \EE_Error
89 89
 	 * @throws \EventEspresso\core\libraries\rest_api\Rest_Exception
90 90
 	 */
91
-	public static function registrations_checked_out_count( $wpdb_row, $request, $controller ){
92
-		if( ! is_array( $wpdb_row ) || ! isset( $wpdb_row[ 'Datetime.DTT_ID' ] ) ) {
91
+	public static function registrations_checked_out_count($wpdb_row, $request, $controller) {
92
+		if ( ! is_array($wpdb_row) || ! isset($wpdb_row['Datetime.DTT_ID'])) {
93 93
 			throw new \EE_Error(
94 94
 				sprintf(
95
-					__( 'Cannot calculate registrations_checked_out_count because the database row %1$s does not have an entry for "Datetime.DTT_ID"', 'event_espresso' ),
96
-					print_r( $wpdb_row, true )
95
+					__('Cannot calculate registrations_checked_out_count because the database row %1$s does not have an entry for "Datetime.DTT_ID"', 'event_espresso'),
96
+					print_r($wpdb_row, true)
97 97
 				)
98 98
 			);
99 99
 		}
100
-		self::_verify_current_user_can( 'ee_read_checkins', 'registrations_checked_out_count' );
101
-		return \EEM_Registration::instance()->count_registrations_checked_into_datetime( $wpdb_row[ 'Datetime.DTT_ID' ], false );
100
+		self::_verify_current_user_can('ee_read_checkins', 'registrations_checked_out_count');
101
+		return \EEM_Registration::instance()->count_registrations_checked_into_datetime($wpdb_row['Datetime.DTT_ID'], false);
102 102
 	}
103 103
 
104 104
 
@@ -114,20 +114,20 @@  discard block
 block discarded – undo
114 114
 	 * @throws \EE_Error
115 115
 	 * @throws \EventEspresso\core\libraries\rest_api\Rest_Exception
116 116
 	 */
117
-	public static function spots_taken_pending_payment( $wpdb_row, $request, $controller ){
118
-		if( ! is_array( $wpdb_row ) || ! isset( $wpdb_row[ 'Datetime.DTT_ID' ] ) ) {
117
+	public static function spots_taken_pending_payment($wpdb_row, $request, $controller) {
118
+		if ( ! is_array($wpdb_row) || ! isset($wpdb_row['Datetime.DTT_ID'])) {
119 119
 			throw new \EE_Error(
120 120
 				sprintf(
121
-					__( 'Cannot calculate spots_taken_pending_payment because the database row %1$s does not have an entry for "Datetime.DTT_ID"', 'event_espresso' ),
122
-					print_r( $wpdb_row, true )
121
+					__('Cannot calculate spots_taken_pending_payment because the database row %1$s does not have an entry for "Datetime.DTT_ID"', 'event_espresso'),
122
+					print_r($wpdb_row, true)
123 123
 				)
124 124
 			);
125 125
 		}
126
-		self::_verify_current_user_can( 'ee_read_registrations', 'spots_taken_pending_payment' );
126
+		self::_verify_current_user_can('ee_read_registrations', 'spots_taken_pending_payment');
127 127
 		return \EEM_Registration::instance()->count(
128 128
 			array(
129 129
 				array(
130
-					'Ticket.Datetime.DTT_ID' => $wpdb_row[ 'Datetime.DTT_ID' ],
130
+					'Ticket.Datetime.DTT_ID' => $wpdb_row['Datetime.DTT_ID'],
131 131
 					'STS_ID' => \EEM_Registration::status_id_pending_payment
132 132
 				)
133 133
 			),
Please login to merge, or discard this patch.
core/libraries/rest_api/changes/Changes_In_4_8_36.php 1 patch
Spacing   +20 added lines, -20 removed lines patch added patch discarded remove patch
@@ -15,28 +15,28 @@  discard block
 block discarded – undo
15 15
 		//set a hook to remove the "calculate" query param
16 16
 		add_filter(
17 17
 			'FHEE__EED_Core_Rest_Api___get_response_selection_query_params',
18
-			array( $this, 'remove_calculate_query_param' ),
18
+			array($this, 'remove_calculate_query_param'),
19 19
 			10,
20 20
 			3
21 21
 		);
22 22
 		//don't add the _calculated_fields either
23 23
 		add_filter(
24 24
 			'FHEE__Read__create_entity_from_wpdb_results__entity_before_inaccessible_field_removal',
25
-			array( $this, 'remove_calculated_fields_from_response' ),
25
+			array($this, 'remove_calculated_fields_from_response'),
26 26
 			10,
27 27
 			5
28 28
 		);
29 29
 		//and also don't add the count headers
30 30
 		add_filter(
31 31
 			'FHEE__EventEspresso\core\libraries\rest_api\controllers\Base___get_response_headers',
32
-			array( $this, 'remove_headers_new_in_this_version' ),
32
+			array($this, 'remove_headers_new_in_this_version'),
33 33
 			10,
34 34
 			3
35 35
 		);
36 36
 		//remove the old featured_image part of the response...
37 37
 		add_filter(
38 38
 			'FHEE__Read__create_entity_from_wpdb_results__entity_before_inaccessible_field_removal',
39
-			array( $this, 'remove_old_featured_image_part_of_cpt_entities' ),
39
+			array($this, 'remove_old_featured_image_part_of_cpt_entities'),
40 40
 			10,
41 41
 			5
42 42
 		);
@@ -46,7 +46,7 @@  discard block
 block discarded – undo
46 46
 		//before this, infinity was -1, now it's null
47 47
 		add_filter(
48 48
 			'FHEE__EventEspresso\core\libraries\rest_api\Model_Data_Translator__prepare_field_for_rest_api',
49
-			array( $this, 'use_negative_one_for_infinity_before_this_version' ),
49
+			array($this, 'use_negative_one_for_infinity_before_this_version'),
50 50
 			10,
51 51
 			4
52 52
 		);
@@ -59,9 +59,9 @@  discard block
 block discarded – undo
59 59
 	 * @param string $version
60 60
 	 * @return array
61 61
 	 */
62
-	public function remove_calculate_query_param( $query_params, \EEM_Base $model, $version ) {
63
-		if( $this->applies_to_version( $version ) ) {
64
-			unset( $query_params[ 'calculate' ] );
62
+	public function remove_calculate_query_param($query_params, \EEM_Base $model, $version) {
63
+		if ($this->applies_to_version($version)) {
64
+			unset($query_params['calculate']);
65 65
 		}
66 66
 		return $query_params;
67 67
 	}
@@ -82,8 +82,8 @@  discard block
 block discarded – undo
82 82
 		\WP_REST_Request $request,
83 83
 		Read $controller
84 84
 	) {
85
-		if( $this->applies_to_version( $controller->get_model_version_info()->requested_version() ) ) {
86
-			unset( $entity_response_array[ '_calculated_fields' ] );
85
+		if ($this->applies_to_version($controller->get_model_version_info()->requested_version())) {
86
+			unset($entity_response_array['_calculated_fields']);
87 87
 		}
88 88
 		return $entity_response_array;
89 89
 	}
@@ -101,14 +101,14 @@  discard block
 block discarded – undo
101 101
 		Base $controller,
102 102
 		$version
103 103
 	) {
104
-		if( $this->applies_to_version( $version ) ) {
104
+		if ($this->applies_to_version($version)) {
105 105
 			$headers = array_diff_key(
106 106
 				$headers,
107 107
 				array_flip(
108 108
 					array(
109
-						Base::header_prefix_for_wp . 'Total',
110
-						Base::header_prefix_for_wp . 'TotalPages',
111
-						Base::header_prefix_for_wp . 'PageSize'
109
+						Base::header_prefix_for_wp.'Total',
110
+						Base::header_prefix_for_wp.'TotalPages',
111
+						Base::header_prefix_for_wp.'PageSize'
112 112
 					)));
113 113
 		}
114 114
 		return $headers;
@@ -130,14 +130,14 @@  discard block
 block discarded – undo
130 130
 		\WP_REST_Request $request,
131 131
 		Read $controller
132 132
 	) {
133
-		if( $this->applies_to_version( $controller->get_model_version_info()->requested_version() )
133
+		if ($this->applies_to_version($controller->get_model_version_info()->requested_version())
134 134
 			&& $model instanceof \EEM_CPT_Base
135 135
 		) {
136 136
 			$attachment = wp_get_attachment_image_src(
137
-				get_post_thumbnail_id( $entity_response_array[ $model->primary_key_name() ] ),
137
+				get_post_thumbnail_id($entity_response_array[$model->primary_key_name()]),
138 138
 				'full'
139 139
 			);
140
-			$entity_response_array[ 'featured_image_url' ] = !empty( $attachment ) ? $attachment[ 0 ] : null;
140
+			$entity_response_array['featured_image_url'] = ! empty($attachment) ? $attachment[0] : null;
141 141
 		}
142 142
 		return $entity_response_array;
143 143
 	}
@@ -152,9 +152,9 @@  discard block
 block discarded – undo
152 152
 	 * @param string $requested_value
153 153
 	 * @return mixed
154 154
 	 */
155
-	public function use_negative_one_for_infinity_before_this_version( $new_value, $field_obj, $original_value, $requested_value ) {
156
-		if( $this->applies_to_version( $requested_value )
157
-			&& $original_value === EE_INF ) {
155
+	public function use_negative_one_for_infinity_before_this_version($new_value, $field_obj, $original_value, $requested_value) {
156
+		if ($this->applies_to_version($requested_value)
157
+			&& $original_value === EE_INF) {
158 158
 			//return the old representation of infinity in the JSON
159 159
 			return -1;
160 160
 		}
Please login to merge, or discard this patch.
core/libraries/messages/EE_Message_Type_Collection.lib.php 1 patch
Spacing   +23 added lines, -23 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
 
@@ -39,9 +39,9 @@  discard block
 block discarded – undo
39 39
 	 * @param mixed  $info
40 40
 	 * @return bool
41 41
 	 */
42
-	public function add( $object, $info = null ) {
43
-		$info = empty( $info ) && $object instanceof $this->interface ? $object->name : $info;
44
-		return parent::add( $object, $info );
42
+	public function add($object, $info = null) {
43
+		$info = empty($info) && $object instanceof $this->interface ? $object->name : $info;
44
+		return parent::add($object, $info);
45 45
 	}
46 46
 
47 47
 
@@ -57,9 +57,9 @@  discard block
 block discarded – undo
57 57
 	 * @param mixed  $info
58 58
 	 * @return bool
59 59
 	 */
60
-	public function set_info( $object, $info = null ) {
61
-		$info = empty( $info ) && $object instanceof $this->interface ? $object->name : $info;
62
-		return parent::set_info( $object, $info );
60
+	public function set_info($object, $info = null) {
61
+		$info = empty($info) && $object instanceof $this->interface ? $object->name : $info;
62
+		return parent::set_info($object, $info);
63 63
 	}
64 64
 
65 65
 
@@ -74,8 +74,8 @@  discard block
 block discarded – undo
74 74
 	 * @param mixed
75 75
 	 * @return null | object
76 76
 	 */
77
-	public function get_by_info( $info ) {
78
-		return parent::get_by_info( str_replace( ' ', '_', strtolower( $info ) ) );
77
+	public function get_by_info($info) {
78
+		return parent::get_by_info(str_replace(' ', '_', strtolower($info)));
79 79
 	}
80 80
 
81 81
 
@@ -89,8 +89,8 @@  discard block
 block discarded – undo
89 89
 	 * @param object $object
90 90
 	 * @return bool
91 91
 	 */
92
-	public function has( $object ) {
93
-		return parent::has( $object );
92
+	public function has($object) {
93
+		return parent::has($object);
94 94
 	}
95 95
 
96 96
 
@@ -104,8 +104,8 @@  discard block
 block discarded – undo
104 104
 	 * @param string $message_type_name
105 105
 	 * @return bool
106 106
 	 */
107
-	public function has_by_name( $message_type_name ) {
108
-		return $this->get_by_info( $message_type_name ) instanceof $this->interface ? true : false;
107
+	public function has_by_name($message_type_name) {
108
+		return $this->get_by_info($message_type_name) instanceof $this->interface ? true : false;
109 109
 	}
110 110
 
111 111
 
@@ -119,8 +119,8 @@  discard block
 block discarded – undo
119 119
 	 * @param $object
120 120
 	 * @return bool
121 121
 	 */
122
-	public function remove( $object ) {
123
-		return parent::remove( $object );
122
+	public function remove($object) {
123
+		return parent::remove($object);
124 124
 	}
125 125
 
126 126
 
@@ -134,8 +134,8 @@  discard block
 block discarded – undo
134 134
 	 * @param $object
135 135
 	 * @return void
136 136
 	 */
137
-	public function set_current( $object ) {
138
-		parent::set_current( $object );
137
+	public function set_current($object) {
138
+		parent::set_current($object);
139 139
 	}
140 140
 
141 141
 
@@ -149,8 +149,8 @@  discard block
 block discarded – undo
149 149
 	 * @param $info
150 150
 	 * @return void
151 151
 	 */
152
-	public function set_current_by_info( $info ) {
153
-		parent::set_current_by_info( $info );
152
+	public function set_current_by_info($info) {
153
+		parent::set_current_by_info($info);
154 154
 	}
155 155
 
156 156
 
@@ -164,10 +164,10 @@  discard block
 block discarded – undo
164 164
 	 * @return void
165 165
 	 */
166 166
 	public function show_collection_classes() {
167
-		if ( WP_DEBUG ) {
167
+		if (WP_DEBUG) {
168 168
 			$this->rewind();
169
-			while ( $this->valid() ) {
170
-				echo '<h5 style="color:#2EA2CC;">' . __CLASS__ . ' class : <span style="color:#E76700">' . $this->getInfo() . '</span></h5>';
169
+			while ($this->valid()) {
170
+				echo '<h5 style="color:#2EA2CC;">'.__CLASS__.' class : <span style="color:#E76700">'.$this->getInfo().'</span></h5>';
171 171
 				$this->next();
172 172
 			}
173 173
 		}
Please login to merge, or discard this patch.
core/libraries/messages/EE_Messenger_Collection.lib.php 1 patch
Spacing   +23 added lines, -23 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
 
@@ -39,9 +39,9 @@  discard block
 block discarded – undo
39 39
 	 * @param mixed  $info
40 40
 	 * @return bool
41 41
 	 */
42
-	public function add( $object, $info = null ) {
43
-		$info = empty( $info ) && $object instanceof $this->interface ? $object->name : $info;
44
-		return parent::add( $object, $info );
42
+	public function add($object, $info = null) {
43
+		$info = empty($info) && $object instanceof $this->interface ? $object->name : $info;
44
+		return parent::add($object, $info);
45 45
 	}
46 46
 
47 47
 
@@ -57,9 +57,9 @@  discard block
 block discarded – undo
57 57
 	 * @param mixed  $info
58 58
 	 * @return bool
59 59
 	 */
60
-	public function set_info( $object, $info = null ) {
61
-		$info = empty( $info ) && $object instanceof $this->interface ? $object->name : $info;
62
-		return parent::set_info( $object, $info );
60
+	public function set_info($object, $info = null) {
61
+		$info = empty($info) && $object instanceof $this->interface ? $object->name : $info;
62
+		return parent::set_info($object, $info);
63 63
 	}
64 64
 
65 65
 
@@ -74,8 +74,8 @@  discard block
 block discarded – undo
74 74
 	 * @param mixed
75 75
 	 * @return null | object
76 76
 	 */
77
-	public function get_by_info( $info ) {
78
-		return parent::get_by_info( str_replace( ' ', '_', strtolower( $info ) ) );
77
+	public function get_by_info($info) {
78
+		return parent::get_by_info(str_replace(' ', '_', strtolower($info)));
79 79
 	}
80 80
 
81 81
 
@@ -89,8 +89,8 @@  discard block
 block discarded – undo
89 89
 	 * @param object $object
90 90
 	 * @return bool
91 91
 	 */
92
-	public function has( $object ) {
93
-		return parent::has( $object );
92
+	public function has($object) {
93
+		return parent::has($object);
94 94
 	}
95 95
 
96 96
 
@@ -104,8 +104,8 @@  discard block
 block discarded – undo
104 104
 	 * @param string $messenger_name
105 105
 	 * @return bool
106 106
 	 */
107
-	public function has_by_name( $messenger_name ) {
108
-		return $this->get_by_info( $messenger_name ) instanceof $this->interface ? true : false;
107
+	public function has_by_name($messenger_name) {
108
+		return $this->get_by_info($messenger_name) instanceof $this->interface ? true : false;
109 109
 	}
110 110
 
111 111
 
@@ -119,8 +119,8 @@  discard block
 block discarded – undo
119 119
 	 * @param $object
120 120
 	 * @return bool
121 121
 	 */
122
-	public function remove( $object ) {
123
-		return parent::remove( $object );
122
+	public function remove($object) {
123
+		return parent::remove($object);
124 124
 	}
125 125
 
126 126
 
@@ -148,8 +148,8 @@  discard block
 block discarded – undo
148 148
 	 * @param $object
149 149
 	 * @return void
150 150
 	 */
151
-	public function set_current( $object ) {
152
-		parent::set_current( $object );
151
+	public function set_current($object) {
152
+		parent::set_current($object);
153 153
 	}
154 154
 
155 155
 
@@ -163,8 +163,8 @@  discard block
 block discarded – undo
163 163
 	 * @param $info
164 164
 	 * @return void
165 165
 	 */
166
-	public function set_current_by_info( $info ) {
167
-		parent::set_current_by_info( $info );
166
+	public function set_current_by_info($info) {
167
+		parent::set_current_by_info($info);
168 168
 	}
169 169
 
170 170
 
@@ -178,10 +178,10 @@  discard block
 block discarded – undo
178 178
 	 * @return void
179 179
 	 */
180 180
 	public function show_collection_classes() {
181
-		if ( WP_DEBUG ) {
181
+		if (WP_DEBUG) {
182 182
 			$this->rewind();
183
-			while ( $this->valid() ) {
184
-				echo '<h5 style="color:#2EA2CC;">' . __CLASS__ . ' class : . <span style="color:#E76700">' . $this->getInfo() . '</span></h5>';
183
+			while ($this->valid()) {
184
+				echo '<h5 style="color:#2EA2CC;">'.__CLASS__.' class : . <span style="color:#E76700">'.$this->getInfo().'</span></h5>';
185 185
 				$this->next();
186 186
 			}
187 187
 		}
Please login to merge, or discard this patch.
public/Espresso_Arabica_2014/functions.php 1 patch
Spacing   +7 added lines, -7 removed lines patch added patch discarded remove patch
@@ -9,9 +9,9 @@  discard block
 block discarded – undo
9 9
  * @ link			http://www.eventespresso.com
10 10
  * @ version		4+
11 11
  */
12
-define( 'EE_THEME_FUNCTIONS_LOADED', TRUE );
12
+define('EE_THEME_FUNCTIONS_LOADED', TRUE);
13 13
 
14
-if ( ! function_exists( 'espresso_pagination' ) ) {
14
+if ( ! function_exists('espresso_pagination')) {
15 15
 	/**
16 16
 	 *    espresso_pagination
17 17
 	 *
@@ -23,21 +23,21 @@  discard block
 block discarded – undo
23 23
 		$big = 999999999; // need an unlikely integer
24 24
 		$pagination = paginate_links(
25 25
 			array(
26
-				'base'         => str_replace( $big, '%#%', esc_url( get_pagenum_link( $big ) ) ),
26
+				'base'         => str_replace($big, '%#%', esc_url(get_pagenum_link($big))),
27 27
 				'format'       => '?paged=%#%',
28
-				'current'      => max( 1, get_query_var( 'paged' ) ),
28
+				'current'      => max(1, get_query_var('paged')),
29 29
 				'total'        => $wp_query->max_num_pages,
30 30
 				'show_all'     => true,
31 31
 				'end_size'     => 10,
32 32
 				'mid_size'     => 6,
33 33
 				'prev_next'    => true,
34
-				'prev_text'    => __( '&lsaquo; PREV', 'event_espresso' ),
35
-				'next_text'    => __( 'NEXT &rsaquo;', 'event_espresso' ),
34
+				'prev_text'    => __('&lsaquo; PREV', 'event_espresso'),
35
+				'next_text'    => __('NEXT &rsaquo;', 'event_espresso'),
36 36
 				'type'         => 'plain',
37 37
 				'add_args'     => false,
38 38
 				'add_fragment' => ''
39 39
 			)
40 40
 		);
41
-		echo ! empty( $pagination ) ? '<div class="ee-pagination-dv clear">' . $pagination . '</div>' : '';
41
+		echo ! empty($pagination) ? '<div class="ee-pagination-dv clear">'.$pagination.'</div>' : '';
42 42
 	}
43 43
 }
44 44
\ No newline at end of file
Please login to merge, or discard this patch.
core/libraries/rest_api/Capabilities.php 2 patches
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -77,7 +77,7 @@
 block discarded – undo
77 77
 		}
78 78
 		foreach( $model->field_settings() as $field_name => $field_obj ){
79 79
 			if( $model_version_info->field_has_rendered_format( $field_obj )
80
-			    && isset( $entity[ $field_name ] )
80
+				&& isset( $entity[ $field_name ] )
81 81
 				&& is_array( $entity[ $field_name ] )
82 82
 				&& isset( $entity[ $field_name ][ 'raw' ] )
83 83
 			) {
Please login to merge, or discard this patch.
Spacing   +23 added lines, -23 removed lines patch added patch discarded remove patch
@@ -1,7 +1,7 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 namespace EventEspresso\core\libraries\rest_api;
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
 /**
@@ -21,16 +21,16 @@  discard block
 block discarded – undo
21 21
 	 * @param string $model_context one of the return values from EEM_Base::valid_cap_contexts()
22 22
 	 * @return boolean
23 23
 	 */
24
-	public static function current_user_has_partial_access_to( $model, $model_context = \EEM_Base::caps_read ) {
25
-		if( apply_filters( 'FHEE__Capabilities__current_user_has_partial_access_to__override_begin', false, $model, $model ) ) {
24
+	public static function current_user_has_partial_access_to($model, $model_context = \EEM_Base::caps_read) {
25
+		if (apply_filters('FHEE__Capabilities__current_user_has_partial_access_to__override_begin', false, $model, $model)) {
26 26
 			return true;
27 27
 		}
28
-		foreach( $model->caps_missing( $model_context ) as $capability_name => $restriction_obj ) {
29
-			if( $restriction_obj instanceof \EE_Return_None_Where_Conditions ){
28
+		foreach ($model->caps_missing($model_context) as $capability_name => $restriction_obj) {
29
+			if ($restriction_obj instanceof \EE_Return_None_Where_Conditions) {
30 30
 				return false;
31 31
 			}
32 32
 		}
33
-		if( apply_filters( 'FHEE__Capabilities__current_user_has_partial_access_to__override_end', false, $model, $model ) ) {
33
+		if (apply_filters('FHEE__Capabilities__current_user_has_partial_access_to__override_end', false, $model, $model)) {
34 34
 			return false;
35 35
 		}
36 36
 		return true;
@@ -43,8 +43,8 @@  discard block
 block discarded – undo
43 43
 	 * @param string $request_type one of the constants on WP_JSON_Server
44 44
 	 * @return array
45 45
 	 */
46
-	public static function get_missing_permissions( $model, $request_type = \EEM_Base::caps_read ) {
47
-		return $model->caps_missing( $request_type );
46
+	public static function get_missing_permissions($model, $request_type = \EEM_Base::caps_read) {
47
+		return $model->caps_missing($request_type);
48 48
 	}
49 49
 	/**
50 50
 	 * Gets a string of all the capabilities the current user is missing that affected
@@ -54,8 +54,8 @@  discard block
 block discarded – undo
54 54
 	 * @param string $model_context one of the return values from EEM_Base::valid_cap_contexts()
55 55
 	 * @return string
56 56
 	 */
57
-	public static function get_missing_permissions_string( $model, $model_context = \EEM_Base::caps_read ) {
58
-		return implode(',', array_keys( self::get_missing_permissions( $model, $model_context ) ) );
57
+	public static function get_missing_permissions_string($model, $model_context = \EEM_Base::caps_read) {
58
+		return implode(',', array_keys(self::get_missing_permissions($model, $model_context)));
59 59
 	}
60 60
 
61 61
 	/**
@@ -66,27 +66,27 @@  discard block
 block discarded – undo
66 66
 	 * @param Model_Version_Info $model_version_info
67 67
 	 * @return array ready for converting into json
68 68
 	 */
69
-	public static function filter_out_inaccessible_entity_fields( $entity,  $model, $request_type, $model_version_info ) {
69
+	public static function filter_out_inaccessible_entity_fields($entity, $model, $request_type, $model_version_info) {
70 70
 		//we only care to do this for frontend reads and when the user can't edit the item
71
-		if(  $request_type !== \EEM_Base::caps_read ||
72
-				$model->exists( array(
73
-					array( $model->primary_key_name() => $entity[ $model->primary_key_name() ] ),
71
+		if ($request_type !== \EEM_Base::caps_read ||
72
+				$model->exists(array(
73
+					array($model->primary_key_name() => $entity[$model->primary_key_name()]),
74 74
 					'default_where_conditions' => 'none',
75
-					'caps' => \EEM_Base::caps_edit ) ) ) {
75
+					'caps' => \EEM_Base::caps_edit ))) {
76 76
 			return $entity;
77 77
 		}
78
-		foreach( $model->field_settings() as $field_name => $field_obj ){
79
-			if( $model_version_info->field_has_rendered_format( $field_obj )
80
-			    && isset( $entity[ $field_name ] )
81
-				&& is_array( $entity[ $field_name ] )
82
-				&& isset( $entity[ $field_name ][ 'raw' ] )
78
+		foreach ($model->field_settings() as $field_name => $field_obj) {
79
+			if ($model_version_info->field_has_rendered_format($field_obj)
80
+			    && isset($entity[$field_name])
81
+				&& is_array($entity[$field_name])
82
+				&& isset($entity[$field_name]['raw'])
83 83
 			) {
84
-				unset( $entity[ $field_name ][ 'raw' ] );
84
+				unset($entity[$field_name]['raw']);
85 85
 			}
86 86
 		}
87 87
 		//theoretically we may want to filter out specific fields for specific models
88 88
 
89
-		return apply_filters( 'FHEE__Capabilities__filter_out_inaccessible_entity_fields', $entity, $model, $request_type );
89
+		return apply_filters('FHEE__Capabilities__filter_out_inaccessible_entity_fields', $entity, $model, $request_type);
90 90
 	}
91 91
 }
92 92
 
Please login to merge, or discard this patch.
core/admin/PostShortcodeTracking.php 3 patches
Doc Comments   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -864,7 +864,7 @@
 block discarded – undo
864 864
 	 * @param  int $ID
865 865
 	 * @param      $shortcode_class
866 866
 	 * @param      $shortcode_posts
867
-	 * @param      $page_for_posts
867
+	 * @param      string $page_for_posts
868 868
 	 * @return bool
869 869
 	 */
870 870
 	protected static function unset_posts_page_shortcode_for_post( $ID, $shortcode_class, $shortcode_posts, $page_for_posts ) {
Please login to merge, or discard this patch.
Indentation   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -316,7 +316,7 @@
 block discarded – undo
316 316
 		);
317 317
 		// verify that post_shortcodes is set
318 318
 		\EE_Config::instance()->core->post_shortcodes = isset( \EE_Config::instance()->core->post_shortcodes )
319
-		                                                && is_array( \EE_Config::instance()->core->post_shortcodes )
319
+														&& is_array( \EE_Config::instance()->core->post_shortcodes )
320 320
 			? \EE_Config::instance()->core->post_shortcodes
321 321
 			: array();
322 322
 		// cycle thru post_shortcodes
Please login to merge, or discard this patch.
Spacing   +84 added lines, -84 removed lines patch added patch discarded remove patch
@@ -1,8 +1,8 @@  discard block
 block discarded – undo
1 1
 <?php
2 2
 namespace EventEspresso\core\admin;
3 3
 
4
-if ( ! defined( 'EVENT_ESPRESSO_VERSION' ) ) {
5
-	exit( 'No direct script access allowed' );
4
+if ( ! defined('EVENT_ESPRESSO_VERSION')) {
5
+	exit('No direct script access allowed');
6 6
 }
7 7
 
8 8
 
@@ -28,31 +28,31 @@  discard block
 block discarded – undo
28 28
 	public static function set_hooks_admin() {
29 29
 		add_action(
30 30
 			'save_post',
31
-			array( 'EventEspresso\core\admin\PostShortcodeTracking', 'parse_post_content_on_save' ),
31
+			array('EventEspresso\core\admin\PostShortcodeTracking', 'parse_post_content_on_save'),
32 32
 			100,
33 33
 			2
34 34
 		);
35 35
 		add_action(
36 36
 			'delete_post',
37
-			array( 'EventEspresso\core\admin\PostShortcodeTracking', 'unset_post_shortcodes_on_delete' ),
37
+			array('EventEspresso\core\admin\PostShortcodeTracking', 'unset_post_shortcodes_on_delete'),
38 38
 			100,
39 39
 			1
40 40
 		);
41 41
 		add_action(
42 42
 			'add_option_page_for_posts',
43
-			array( 'EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_initial_set' ),
43
+			array('EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_initial_set'),
44 44
 			100,
45 45
 			2
46 46
 		);
47 47
 		add_action(
48 48
 			'update_option',
49
-			array( 'EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_change' ),
49
+			array('EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_change'),
50 50
 			100,
51 51
 			3
52 52
 		);
53 53
 		add_action(
54 54
 			'delete_option',
55
-			array( 'EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_delete' ),
55
+			array('EventEspresso\core\admin\PostShortcodeTracking', 'reset_page_for_posts_on_delete'),
56 56
 			100,
57 57
 			1
58 58
 		);
@@ -72,61 +72,61 @@  discard block
 block discarded – undo
72 72
 	 * @param \WP_Post $post
73 73
 	 * @return    void
74 74
 	 */
75
-	public static function parse_post_content_on_save( $post_ID, $post ) {
75
+	public static function parse_post_content_on_save($post_ID, $post) {
76 76
 		// if the post is trashed, then let's remove our post shortcode tracking
77
-		if ( $post instanceof \WP_Post && $post->post_status === 'trash' ) {
78
-			PostShortcodeTracking::unset_post_shortcodes_on_delete( $post_ID );
77
+		if ($post instanceof \WP_Post && $post->post_status === 'trash') {
78
+			PostShortcodeTracking::unset_post_shortcodes_on_delete($post_ID);
79 79
 			return;
80 80
 		}
81 81
 		// default post types
82
-		$post_types = array( 'post' => 0, 'page' => 1 );
82
+		$post_types = array('post' => 0, 'page' => 1);
83 83
 		// add CPTs
84 84
 		$CPTs = \EE_Register_CPTs::get_CPTs();
85
-		$post_types = array_merge( $post_types, $CPTs );
85
+		$post_types = array_merge($post_types, $CPTs);
86 86
 		// for default or CPT posts...
87
-		if ( isset( $post_types[ $post->post_type ] ) ) {
87
+		if (isset($post_types[$post->post_type])) {
88 88
 			// post on frontpage ?
89 89
 			$page_for_posts = \EE_Config::get_page_for_posts();
90
-			if ( $post->post_name === $page_for_posts ) {
91
-				PostShortcodeTracking::set_post_shortcodes_for_posts_page( $page_for_posts );
90
+			if ($post->post_name === $page_for_posts) {
91
+				PostShortcodeTracking::set_post_shortcodes_for_posts_page($page_for_posts);
92 92
 				return;
93 93
 			}
94 94
 			// array of shortcodes indexed by post name
95
-			\EE_Registry::CFG()->core->post_shortcodes = isset( \EE_Registry::CFG()->core->post_shortcodes )
95
+			\EE_Registry::CFG()->core->post_shortcodes = isset(\EE_Registry::CFG()->core->post_shortcodes)
96 96
 				? \EE_Registry::CFG()->core->post_shortcodes
97 97
 				: array();
98 98
 			// whether to proceed with update
99 99
 			$update_post_shortcodes = false;
100 100
 			// empty both arrays
101
-			\EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ] = array();
101
+			\EE_Registry::CFG()->core->post_shortcodes[$post->post_name] = array();
102 102
 			// check that posts page is already being tracked
103
-			if ( ! isset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ] ) ) {
103
+			if ( ! isset(\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts])) {
104 104
 				// if not, then ensure that it is properly added
105
-				\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ] = array();
105
+				\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts] = array();
106 106
 			}
107 107
 			// loop thru shortcodes
108
-			foreach ( \EE_Registry::instance()->shortcodes as $EES_Shortcode => $shortcode_dir ) {
108
+			foreach (\EE_Registry::instance()->shortcodes as $EES_Shortcode => $shortcode_dir) {
109 109
 				// convert to UPPERCASE to get actual shortcode
110
-				$EES_Shortcode = strtoupper( $EES_Shortcode );
110
+				$EES_Shortcode = strtoupper($EES_Shortcode);
111 111
 				// is the shortcode in the post_content ?
112
-				if ( strpos( $post->post_content, $EES_Shortcode ) !== false ) {
112
+				if (strpos($post->post_content, $EES_Shortcode) !== false) {
113 113
 					// map shortcode to post names and post IDs
114
-					\EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ][ $EES_Shortcode ] = $post_ID;
114
+					\EE_Registry::CFG()->core->post_shortcodes[$post->post_name][$EES_Shortcode] = $post_ID;
115 115
 					// and add this shortcode to the tracking for the blog page
116
-					PostShortcodeTracking::set_post_shortcode_for_posts_page( $page_for_posts, $EES_Shortcode, $post_ID );
116
+					PostShortcodeTracking::set_post_shortcode_for_posts_page($page_for_posts, $EES_Shortcode, $post_ID);
117 117
 					$update_post_shortcodes = true;
118 118
 				} else {
119 119
 					// shortcode is not present in post content, so check if we were tracking it previously
120 120
 					// stop tracking if shortcode is not used in this specific post
121
-					if ( isset( \EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ][ $EES_Shortcode ] ) ) {
122
-						unset( \EE_Registry::CFG()->core->post_shortcodes[ $post->post_name ][ $EES_Shortcode ] );
121
+					if (isset(\EE_Registry::CFG()->core->post_shortcodes[$post->post_name][$EES_Shortcode])) {
122
+						unset(\EE_Registry::CFG()->core->post_shortcodes[$post->post_name][$EES_Shortcode]);
123 123
 						$update_post_shortcodes = true;
124 124
 					}
125 125
 					// make sure that something is set for the shortcode posts (even though we may remove this)
126 126
 					$shortcode_posts = isset(
127
-						\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ]
127
+						\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode]
128 128
 					)
129
-						? \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ]
129
+						? \EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode]
130 130
 						: array();
131 131
 					// and stop tracking for this shortcode on the blog page if it is not used
132 132
 					$update_post_shortcodes = PostShortcodeTracking::unset_posts_page_shortcode_for_post(
@@ -140,8 +140,8 @@  discard block
 block discarded – undo
140 140
 						: $update_post_shortcodes;
141 141
 				}
142 142
 			}
143
-			if ( $update_post_shortcodes ) {
144
-				PostShortcodeTracking::update_post_shortcodes( $page_for_posts );
143
+			if ($update_post_shortcodes) {
144
+				PostShortcodeTracking::update_post_shortcodes($page_for_posts);
145 145
 			}
146 146
 		}
147 147
 	}
@@ -158,15 +158,15 @@  discard block
 block discarded – undo
158 158
 	 * @param  string $page_for_posts
159 159
 	 * @return void
160 160
 	 */
161
-	protected static function set_post_shortcodes_for_posts_page( $page_for_posts ) {
162
-		\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ] = array();
161
+	protected static function set_post_shortcodes_for_posts_page($page_for_posts) {
162
+		\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts] = array();
163 163
 		// loop thru shortcodes
164
-		foreach ( \EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes ) {
165
-			foreach ( $post_shortcodes as $EES_Shortcode => $post_ID ) {
166
-				PostShortcodeTracking::set_post_shortcode_for_posts_page( $page_for_posts, $EES_Shortcode, $post_ID );
164
+		foreach (\EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes) {
165
+			foreach ($post_shortcodes as $EES_Shortcode => $post_ID) {
166
+				PostShortcodeTracking::set_post_shortcode_for_posts_page($page_for_posts, $EES_Shortcode, $post_ID);
167 167
 			}
168 168
 		}
169
-		PostShortcodeTracking::update_post_shortcodes( $page_for_posts );
169
+		PostShortcodeTracking::update_post_shortcodes($page_for_posts);
170 170
 	}
171 171
 
172 172
 
@@ -181,24 +181,24 @@  discard block
 block discarded – undo
181 181
 	 * @param         $EES_Shortcode
182 182
 	 * @param         $post_ID
183 183
 	 */
184
-	protected static function set_post_shortcode_for_posts_page( $page_for_posts, $EES_Shortcode, $post_ID ) {
184
+	protected static function set_post_shortcode_for_posts_page($page_for_posts, $EES_Shortcode, $post_ID) {
185 185
 		// critical page shortcodes that we do NOT want added to the Posts page (blog)
186 186
 		$critical_shortcodes = \EE_Registry::CFG()->core->get_critical_pages_shortcodes_array();
187 187
 		// if the shortcode is NOT one of the critical page shortcodes like ESPRESSO_TXN_PAGE
188
-		if ( in_array( $EES_Shortcode, $critical_shortcodes ) ) {
188
+		if (in_array($EES_Shortcode, $critical_shortcodes)) {
189 189
 			return;
190 190
 		}
191 191
 		// add shortcode to "Posts page" tracking
192
-		if ( isset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] ) ) {
192
+		if (isset(\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode])) {
193 193
 			// make sure tracking is in form of an array
194
-			if ( ! is_array( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] ) ) {
195
-				\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] = array(
196
-					\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] => true
194
+			if ( ! is_array(\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode])) {
195
+				\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode] = array(
196
+					\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode] => true
197 197
 				);
198 198
 			}
199
-			\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] += array( $post_ID => true );
199
+			\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode] += array($post_ID => true);
200 200
 		} else {
201
-			\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $EES_Shortcode ] = array( $post_ID => true );
201
+			\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$EES_Shortcode] = array($post_ID => true);
202 202
 		}
203 203
 	}
204 204
 
@@ -211,16 +211,16 @@  discard block
 block discarded – undo
211 211
 	 * @param  int $ID
212 212
 	 * @return void
213 213
 	 */
214
-	public static function unset_post_shortcodes_on_delete( $ID ) {
214
+	public static function unset_post_shortcodes_on_delete($ID) {
215 215
 		$update_post_shortcodes = false;
216 216
 		// post on frontpage ?
217 217
 		$page_for_posts = \EE_Config::get_page_for_posts();
218 218
 		// looking for any references to this post
219
-		foreach ( \EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes ) {
219
+		foreach (\EE_Registry::CFG()->core->post_shortcodes as $post_name => $post_shortcodes) {
220 220
 			// is this the "Posts Page" (blog) ?
221
-			if ( $post_name === $page_for_posts ) {
221
+			if ($post_name === $page_for_posts) {
222 222
 				// loop thru shortcodes registered for the posts page
223
-				foreach ( $post_shortcodes as $shortcode_class => $shortcode_posts ) {
223
+				foreach ($post_shortcodes as $shortcode_class => $shortcode_posts) {
224 224
 					$update_post_shortcodes = PostShortcodeTracking::unset_posts_page_shortcode_for_post(
225 225
 						$ID,
226 226
 						$shortcode_class,
@@ -233,17 +233,17 @@  discard block
 block discarded – undo
233 233
 				}
234 234
 			} else {
235 235
 				// loop thru shortcodes registered for each page
236
-				foreach ( $post_shortcodes as $shortcode_class => $post_ID ) {
236
+				foreach ($post_shortcodes as $shortcode_class => $post_ID) {
237 237
 					// if this is page is being deleted, then don't track any post shortcodes for it
238
-					if ( $post_ID === $ID ) {
239
-						unset( \EE_Registry::CFG()->core->post_shortcodes[ $post_name ] );
238
+					if ($post_ID === $ID) {
239
+						unset(\EE_Registry::CFG()->core->post_shortcodes[$post_name]);
240 240
 						$update_post_shortcodes = true;
241 241
 					}
242 242
 				}
243 243
 			}
244 244
 		}
245
-		if ( $update_post_shortcodes ) {
246
-			PostShortcodeTracking::update_post_shortcodes( $page_for_posts );
245
+		if ($update_post_shortcodes) {
246
+			PostShortcodeTracking::update_post_shortcodes($page_for_posts);
247 247
 		}
248 248
 	}
249 249
 
@@ -268,20 +268,20 @@  discard block
 block discarded – undo
268 268
 		$update_post_shortcodes = false
269 269
 	) {
270 270
 		// make sure that an array of post IDs is being tracked for each  shortcode
271
-		if ( ! is_array( $shortcode_posts ) ) {
272
-			\EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ] = array(
271
+		if ( ! is_array($shortcode_posts)) {
272
+			\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$shortcode_class] = array(
273 273
 				$shortcode_posts => true
274 274
 			);
275 275
 			$update_post_shortcodes = true;
276 276
 		}
277 277
 		// now if the ID of the post being deleted is in the $shortcode_posts array
278
-		if ( is_array( $shortcode_posts ) && isset( $shortcode_posts[ $ID ] ) ) {
279
-			unset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ][ $ID ] );
278
+		if (is_array($shortcode_posts) && isset($shortcode_posts[$ID])) {
279
+			unset(\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$shortcode_class][$ID]);
280 280
 			$update_post_shortcodes = true;
281 281
 		}
282 282
 		// if nothing is registered for that shortcode anymore, then delete the shortcode altogether
283
-		if ( empty( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ] ) ) {
284
-			unset( \EE_Registry::CFG()->core->post_shortcodes[ $page_for_posts ][ $shortcode_class ] );
283
+		if (empty(\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$shortcode_class])) {
284
+			unset(\EE_Registry::CFG()->core->post_shortcodes[$page_for_posts][$shortcode_class]);
285 285
 			$update_post_shortcodes = true;
286 286
 		}
287 287
 		return $update_post_shortcodes;
@@ -296,9 +296,9 @@  discard block
 block discarded – undo
296 296
 	 * @param $page_for_posts
297 297
 	 * @return    void
298 298
 	 */
299
-	public static function update_post_shortcodes( $page_for_posts = '' ) {
299
+	public static function update_post_shortcodes($page_for_posts = '') {
300 300
 		// make sure page_for_posts is set
301
-		$page_for_posts = ! empty( $page_for_posts )
301
+		$page_for_posts = ! empty($page_for_posts)
302 302
 			? $page_for_posts
303 303
 			: \EE_Config::get_page_for_posts();
304 304
 		// allow others to mess stuff up :D
@@ -314,45 +314,45 @@  discard block
 block discarded – undo
314 314
 			$page_for_posts
315 315
 		);
316 316
 		// verify that post_shortcodes is set
317
-		\EE_Config::instance()->core->post_shortcodes = isset( \EE_Config::instance()->core->post_shortcodes )
318
-		                                                && is_array( \EE_Config::instance()->core->post_shortcodes )
317
+		\EE_Config::instance()->core->post_shortcodes = isset(\EE_Config::instance()->core->post_shortcodes)
318
+		                                                && is_array(\EE_Config::instance()->core->post_shortcodes)
319 319
 			? \EE_Config::instance()->core->post_shortcodes
320 320
 			: array();
321 321
 		// cycle thru post_shortcodes
322
-		foreach ( \EE_Config::instance()->core->post_shortcodes as $post_name => $shortcodes ) {
322
+		foreach (\EE_Config::instance()->core->post_shortcodes as $post_name => $shortcodes) {
323 323
 			// are there any shortcodes to track ?
324
-			if ( ! empty( $shortcodes ) ) {
324
+			if ( ! empty($shortcodes)) {
325 325
 				// loop thru list of tracked shortcodes
326
-				foreach ( $shortcodes as $shortcode => $post_id ) {
326
+				foreach ($shortcodes as $shortcode => $post_id) {
327 327
 					// if shortcode is for a critical page,
328 328
 					// BUT this is NOT the corresponding critical page for that shortcode
329
-					if ( $post_name === $page_for_posts ) {
329
+					if ($post_name === $page_for_posts) {
330 330
 						continue;
331 331
 					}
332 332
 					// skip the posts page, because we want all shortcodes registered for it
333
-					if ( $post_name === $page_for_posts ) {
333
+					if ($post_name === $page_for_posts) {
334 334
 						continue;
335 335
 					}
336 336
 					// make sure post still exists
337
-					$post = get_post( $post_id );
337
+					$post = get_post($post_id);
338 338
 					// check that the post name matches what we have saved
339
-					if ( $post && $post->post_name === $post_name ) {
339
+					if ($post && $post->post_name === $post_name) {
340 340
 						// if so, then break before hitting the unset below
341 341
 						continue;
342 342
 					}
343 343
 					// we don't like missing posts around here >:(
344
-					unset( \EE_Config::instance()->core->post_shortcodes[ $post_name ] );
344
+					unset(\EE_Config::instance()->core->post_shortcodes[$post_name]);
345 345
 				}
346 346
 			} else {
347 347
 				// you got no shortcodes to keep track of !
348
-				unset( \EE_Config::instance()->core->post_shortcodes[ $post_name ] );
348
+				unset(\EE_Config::instance()->core->post_shortcodes[$post_name]);
349 349
 			}
350 350
 		}
351 351
 		// critical page shortcodes that we do NOT want added to the Posts page (blog)
352 352
 		$critical_shortcodes = \EE_Config::instance()->core->get_critical_pages_shortcodes_array();
353
-		$critical_shortcodes = array_flip( $critical_shortcodes );
354
-		foreach ( $critical_shortcodes as $critical_shortcode ) {
355
-			unset( \EE_Config::instance()->core->post_shortcodes[ $page_for_posts ][ $critical_shortcode ] );
353
+		$critical_shortcodes = array_flip($critical_shortcodes);
354
+		foreach ($critical_shortcodes as $critical_shortcode) {
355
+			unset(\EE_Config::instance()->core->post_shortcodes[$page_for_posts][$critical_shortcode]);
356 356
 		}
357 357
 		//only show errors
358 358
 		\EE_Config::instance()->update_espresso_config();
@@ -372,8 +372,8 @@  discard block
 block discarded – undo
372 372
 	 * @param  string $value
373 373
 	 * @return void
374 374
 	 */
375
-	public static function reset_page_for_posts_on_initial_set( $option, $value ) {
376
-		PostShortcodeTracking::reset_page_for_posts_on_change( $option, '', $value );
375
+	public static function reset_page_for_posts_on_initial_set($option, $value) {
376
+		PostShortcodeTracking::reset_page_for_posts_on_change($option, '', $value);
377 377
 	}
378 378
 
379 379
 
@@ -390,13 +390,13 @@  discard block
 block discarded – undo
390 390
 	 * @param  string $value
391 391
 	 * @return void
392 392
 	 */
393
-	public static function reset_page_for_posts_on_change( $option, $old_value = '', $value = '' ) {
394
-		if ( $option === 'page_for_posts' ) {
393
+	public static function reset_page_for_posts_on_change($option, $old_value = '', $value = '') {
394
+		if ($option === 'page_for_posts') {
395 395
 			global $wpdb;
396 396
 			$table = $wpdb->posts;
397 397
 			$SQL = "SELECT post_name from $table WHERE post_type='posts' OR post_type='page' AND post_status='publish' AND ID=%d";
398
-			$new_page_for_posts = $value ? $wpdb->get_var( $wpdb->prepare( $SQL, $value ) ) : 'posts';
399
-			PostShortcodeTracking::set_post_shortcodes_for_posts_page( $new_page_for_posts );
398
+			$new_page_for_posts = $value ? $wpdb->get_var($wpdb->prepare($SQL, $value)) : 'posts';
399
+			PostShortcodeTracking::set_post_shortcodes_for_posts_page($new_page_for_posts);
400 400
 		}
401 401
 	}
402 402
 
@@ -412,9 +412,9 @@  discard block
 block discarded – undo
412 412
 	 * @param  string $option
413 413
 	 * @return void
414 414
 	 */
415
-	public static function reset_page_for_posts_on_delete( $option ) {
416
-		if ( $option === 'page_for_posts' ) {
417
-			PostShortcodeTracking::set_post_shortcodes_for_posts_page( 'posts' );
415
+	public static function reset_page_for_posts_on_delete($option) {
416
+		if ($option === 'page_for_posts') {
417
+			PostShortcodeTracking::set_post_shortcodes_for_posts_page('posts');
418 418
 		}
419 419
 	}
420 420
 
Please login to merge, or discard this patch.