Completed
Push — master ( d12d3c...408cb5 )
by
unknown
08:29
created
src/bp-templates/bp-legacy/buddypress/assets/_attachments/uploader.php 3 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -22,7 +22,7 @@
 block discarded – undo
22 22
 				<div class="drag-drop-inside">
23 23
 					<p class="drag-drop-info"><?php esc_html_e( 'Drop your file here', 'buddypress' ); ?></p>
24 24
 					<p><?php _ex( 'or', 'Uploader: Drop your file here - or - Select your File', 'buddypress' ); ?></p>
25
-					<p class="drag-drop-buttons"><label for="{{data.browse_button}}" class="<?php echo is_admin() ? 'screen-reader-text' : 'bp-screen-reader-text' ;?>"><?php
25
+					<p class="drag-drop-buttons"><label for="{{data.browse_button}}" class="<?php echo is_admin() ? 'screen-reader-text' : 'bp-screen-reader-text'; ?>"><?php
26 26
 						/* translators: accessibility text */
27 27
 						esc_html_e( 'Select your File', 'buddypress' );
28 28
 					?></label><input id="{{data.browse_button}}" type="button" value="<?php esc_attr_e( 'Select your File', 'buddypress' ); ?>" class="button" /></p>
Please login to merge, or discard this patch.
Braces   +5 added lines, -2 removed lines patch added patch discarded remove patch
@@ -16,11 +16,14 @@
 block discarded – undo
16 16
 		<h3 class="upload-instructions"><?php esc_html_e( 'The web browser on your device cannot be used to upload files.', 'buddypress' ); ?></h3>
17 17
 	<?php elseif ( is_multisite() && ! is_upload_space_available() ) : ?>
18 18
 		<h3 class="upload-instructions"><?php esc_html_e( 'Upload Limit Exceeded', 'buddypress' ); ?></h3>
19
-	<?php else : ?>
19
+	<?php else {
20
+	: ?>
20 21
 		<div id="{{data.container}}">
21 22
 			<div id="{{data.drop_element}}">
22 23
 				<div class="drag-drop-inside">
23
-					<p class="drag-drop-info"><?php esc_html_e( 'Drop your file here', 'buddypress' ); ?></p>
24
+					<p class="drag-drop-info"><?php esc_html_e( 'Drop your file here', 'buddypress' );
25
+}
26
+?></p>
24 27
 					<p><?php _ex( 'or', 'Uploader: Drop your file here - or - Select your File', 'buddypress' ); ?></p>
25 28
 					<p class="drag-drop-buttons"><label for="{{data.browse_button}}" class="<?php echo is_admin() ? 'screen-reader-text' : 'bp-screen-reader-text' ;?>"><?php
26 29
 						/* translators: accessibility text */
Please login to merge, or discard this patch.
Switch Indentation   +3 added lines, -3 removed lines patch added patch discarded remove patch
@@ -23,9 +23,9 @@
 block discarded – undo
23 23
 					<p class="drag-drop-info"><?php esc_html_e( 'Drop your file here', 'buddypress' ); ?></p>
24 24
 					<p><?php _ex( 'or', 'Uploader: Drop your file here - or - Select your File', 'buddypress' ); ?></p>
25 25
 					<p class="drag-drop-buttons"><label for="{{data.browse_button}}" class="<?php echo is_admin() ? 'screen-reader-text' : 'bp-screen-reader-text' ;?>"><?php
26
-						/* translators: accessibility text */
27
-						esc_html_e( 'Select your File', 'buddypress' );
28
-					?></label><input id="{{data.browse_button}}" type="button" value="<?php esc_attr_e( 'Select your File', 'buddypress' ); ?>" class="button" /></p>
26
+		/* translators: accessibility text */
27
+		esc_html_e( 'Select your File', 'buddypress' );
28
+	?></label><input id="{{data.browse_button}}" type="button" value="<?php esc_attr_e( 'Select your File', 'buddypress' ); ?>" class="button" /></p>
29 29
 				</div>
30 30
 			</div>
31 31
 		</div>
Please login to merge, or discard this patch.
src/bp-templates/bp-legacy/buddypress/assets/embeds/footer.php 2 patches
Spacing   +1 added lines, -1 removed lines patch added patch discarded remove patch
@@ -4,6 +4,6 @@
 block discarded – undo
4 4
 				<div class="wp-embed-meta">
5 5
 					<?php
6 6
 					/** This action is documented in wp-includes/theme-compat/embed-content.php */
7
-					do_action( 'embed_content_meta'); ?>
7
+					do_action( 'embed_content_meta' ); ?>
8 8
 				</div>
9 9
 			</div>
10 10
\ No newline at end of file
Please login to merge, or discard this patch.
Switch Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@
 block discarded – undo
3 3
 
4 4
 				<div class="wp-embed-meta">
5 5
 					<?php
6
-					/** This action is documented in wp-includes/theme-compat/embed-content.php */
7
-					do_action( 'embed_content_meta'); ?>
6
+	/** This action is documented in wp-includes/theme-compat/embed-content.php */
7
+	do_action( 'embed_content_meta'); ?>
8 8
 				</div>
9 9
 			</div>
10 10
\ No newline at end of file
Please login to merge, or discard this patch.
src/class-buddypress.php 1 patch
Spacing   +43 added lines, -43 removed lines patch added patch discarded remove patch
@@ -257,13 +257,13 @@  discard block
 block discarded – undo
257 257
 					// /wp-admin/includes/plugin.php file in order to use that function.
258 258
 
259 259
 					// get network-activated plugins
260
-					$plugins = get_site_option( 'active_sitewide_plugins');
260
+					$plugins = get_site_option( 'active_sitewide_plugins' );
261 261
 
262 262
 					// basename
263 263
 					$basename = basename( constant( 'BP_PLUGIN_DIR' ) ) . '/bp-loader.php';
264 264
 
265 265
 					// plugin is network-activated; use main site ID instead
266
-					if ( isset( $plugins[ $basename ] ) ) {
266
+					if ( isset( $plugins[$basename] ) ) {
267 267
 						$current_site = get_current_site();
268 268
 						$root_blog_id = $current_site->blog_id;
269 269
 					}
@@ -437,29 +437,29 @@  discard block
 block discarded – undo
437 437
 		/** Update/Install ****************************************************/
438 438
 
439 439
 		// Theme compatibility
440
-		require( $this->plugin_dir . 'bp-core/bp-core-template-loader.php'     );
440
+		require( $this->plugin_dir . 'bp-core/bp-core-template-loader.php' );
441 441
 		require( $this->plugin_dir . 'bp-core/bp-core-theme-compatibility.php' );
442 442
 
443 443
 		// Require all of the BuddyPress core libraries
444
-		require( $this->plugin_dir . 'bp-core/bp-core-dependency.php'       );
445
-		require( $this->plugin_dir . 'bp-core/bp-core-actions.php'          );
446
-		require( $this->plugin_dir . 'bp-core/bp-core-caps.php'             );
447
-		require( $this->plugin_dir . 'bp-core/bp-core-cache.php'            );
448
-		require( $this->plugin_dir . 'bp-core/bp-core-cssjs.php'            );
449
-		require( $this->plugin_dir . 'bp-core/bp-core-update.php'           );
450
-		require( $this->plugin_dir . 'bp-core/bp-core-options.php'          );
451
-		require( $this->plugin_dir . 'bp-core/bp-core-taxonomy.php'         );
452
-		require( $this->plugin_dir . 'bp-core/bp-core-filters.php'          );
453
-		require( $this->plugin_dir . 'bp-core/bp-core-attachments.php'      );
454
-		require( $this->plugin_dir . 'bp-core/bp-core-avatars.php'          );
455
-		require( $this->plugin_dir . 'bp-core/bp-core-widgets.php'          );
456
-		require( $this->plugin_dir . 'bp-core/bp-core-template.php'         );
457
-		require( $this->plugin_dir . 'bp-core/bp-core-adminbar.php'         );
458
-		require( $this->plugin_dir . 'bp-core/bp-core-buddybar.php'         );
459
-		require( $this->plugin_dir . 'bp-core/bp-core-catchuri.php'         );
460
-		require( $this->plugin_dir . 'bp-core/bp-core-functions.php'        );
461
-		require( $this->plugin_dir . 'bp-core/bp-core-moderation.php'       );
462
-		require( $this->plugin_dir . 'bp-core/bp-core-loader.php'           );
444
+		require( $this->plugin_dir . 'bp-core/bp-core-dependency.php' );
445
+		require( $this->plugin_dir . 'bp-core/bp-core-actions.php' );
446
+		require( $this->plugin_dir . 'bp-core/bp-core-caps.php' );
447
+		require( $this->plugin_dir . 'bp-core/bp-core-cache.php' );
448
+		require( $this->plugin_dir . 'bp-core/bp-core-cssjs.php' );
449
+		require( $this->plugin_dir . 'bp-core/bp-core-update.php' );
450
+		require( $this->plugin_dir . 'bp-core/bp-core-options.php' );
451
+		require( $this->plugin_dir . 'bp-core/bp-core-taxonomy.php' );
452
+		require( $this->plugin_dir . 'bp-core/bp-core-filters.php' );
453
+		require( $this->plugin_dir . 'bp-core/bp-core-attachments.php' );
454
+		require( $this->plugin_dir . 'bp-core/bp-core-avatars.php' );
455
+		require( $this->plugin_dir . 'bp-core/bp-core-widgets.php' );
456
+		require( $this->plugin_dir . 'bp-core/bp-core-template.php' );
457
+		require( $this->plugin_dir . 'bp-core/bp-core-adminbar.php' );
458
+		require( $this->plugin_dir . 'bp-core/bp-core-buddybar.php' );
459
+		require( $this->plugin_dir . 'bp-core/bp-core-catchuri.php' );
460
+		require( $this->plugin_dir . 'bp-core/bp-core-functions.php' );
461
+		require( $this->plugin_dir . 'bp-core/bp-core-moderation.php' );
462
+		require( $this->plugin_dir . 'bp-core/bp-core-loader.php' );
463 463
 		require( $this->plugin_dir . 'bp-core/bp-core-customizer-email.php' );
464 464
 
465 465
 		// Maybe load deprecated functionality (this double negative is proof positive!)
@@ -550,8 +550,8 @@  discard block
 block discarded – undo
550 550
 		$component = null;
551 551
 
552 552
 		// First check to see if the class is one without a properly namespaced name.
553
-		if ( isset( $irregular_map[ $class ] ) ) {
554
-			$component = $irregular_map[ $class ];
553
+		if ( isset( $irregular_map[$class] ) ) {
554
+			$component = $irregular_map[$class];
555 555
 
556 556
 		// Next chunk is usually the component name.
557 557
 		} elseif ( in_array( $class_parts[1], $components, true ) ) {
@@ -596,7 +596,7 @@  discard block
 block discarded – undo
596 596
 	private function setup_actions() {
597 597
 
598 598
 		// Add actions to plugin activation and deactivation hooks
599
-		add_action( 'activate_'   . $this->basename, 'bp_activation'   );
599
+		add_action( 'activate_' . $this->basename, 'bp_activation' );
600 600
 		add_action( 'deactivate_' . $this->basename, 'bp_deactivation' );
601 601
 
602 602
 		// If BuddyPress is being deactivated, do not add any actions
@@ -606,21 +606,21 @@  discard block
 block discarded – undo
606 606
 
607 607
 		// Array of BuddyPress core actions
608 608
 		$actions = array(
609
-			'setup_theme',              // Setup the default theme compat
610
-			'setup_current_user',       // Setup currently logged in user
611
-			'register_post_types',      // Register post types
612
-			'register_post_statuses',   // Register post statuses
613
-			'register_taxonomies',      // Register taxonomies
614
-			'register_views',           // Register the views
609
+			'setup_theme', // Setup the default theme compat
610
+			'setup_current_user', // Setup currently logged in user
611
+			'register_post_types', // Register post types
612
+			'register_post_statuses', // Register post statuses
613
+			'register_taxonomies', // Register taxonomies
614
+			'register_views', // Register the views
615 615
 			'register_theme_directory', // Register the theme directory
616
-			'register_theme_packages',  // Register bundled theme packages (bp-themes)
617
-			'load_textdomain',          // Load textdomain
618
-			'add_rewrite_tags',         // Add rewrite tags
616
+			'register_theme_packages', // Register bundled theme packages (bp-themes)
617
+			'load_textdomain', // Load textdomain
618
+			'add_rewrite_tags', // Add rewrite tags
619 619
 			'generate_rewrite_rules'    // Generate rewrite rules
620 620
 		);
621 621
 
622 622
 		// Add the actions
623
-		foreach( $actions as $class_action ) {
623
+		foreach ( $actions as $class_action ) {
624 624
 			if ( method_exists( $this, $class_action ) ) {
625 625
 				add_action( 'bp_' . $class_action, array( $this, $class_action ), 5 );
626 626
 			}
@@ -650,19 +650,19 @@  discard block
 block discarded – undo
650 650
 		$versions['1.6-single'] = get_blog_option( $this->root_blog_id, '_bp_db_version' );
651 651
 
652 652
 		// 1.6-single exists, so trust it
653
-		if ( !empty( $versions['1.6-single'] ) ) {
653
+		if ( ! empty( $versions['1.6-single'] ) ) {
654 654
 			$this->db_version_raw = (int) $versions['1.6-single'];
655 655
 
656 656
 		// If no 1.6-single exists, use the max of the others
657 657
 		} else {
658
-			$versions['1.2']        = get_site_option(                      'bp-core-db-version' );
659
-			$versions['1.5-multi']  = get_site_option(                           'bp-db-version' );
660
-			$versions['1.6-multi']  = get_site_option(                          '_bp_db_version' );
661
-			$versions['1.5-single'] = get_blog_option( $this->root_blog_id,      'bp-db-version' );
658
+			$versions['1.2']        = get_site_option( 'bp-core-db-version' );
659
+			$versions['1.5-multi']  = get_site_option( 'bp-db-version' );
660
+			$versions['1.6-multi']  = get_site_option( '_bp_db_version' );
661
+			$versions['1.5-single'] = get_blog_option( $this->root_blog_id, 'bp-db-version' );
662 662
 
663 663
 			// Remove empty array items
664 664
 			$versions             = array_filter( $versions );
665
-			$this->db_version_raw = (int) ( !empty( $versions ) ) ? (int) max( $versions ) : 0;
665
+			$this->db_version_raw = (int) ( ! empty( $versions ) ) ? (int) max( $versions ) : 0;
666 666
 		}
667 667
 	}
668 668
 
@@ -712,8 +712,8 @@  discard block
 block discarded – undo
712 712
 
713 713
 		// Register the basic theme stack. This is really dope.
714 714
 		bp_register_template_stack( 'get_stylesheet_directory', 10 );
715
-		bp_register_template_stack( 'get_template_directory',   12 );
716
-		bp_register_template_stack( 'bp_get_theme_compat_dir',  14 );
715
+		bp_register_template_stack( 'get_template_directory', 12 );
716
+		bp_register_template_stack( 'bp_get_theme_compat_dir', 14 );
717 717
 	}
718 718
 
719 719
 	/**
Please login to merge, or discard this patch.
src/bp-templates/bp-nouveau/buddypress/assets/embeds/footer.php 1 patch
Switch Indentation   +2 added lines, -2 removed lines patch added patch discarded remove patch
@@ -3,7 +3,7 @@
 block discarded – undo
3 3
 
4 4
 				<div class="wp-embed-meta">
5 5
 					<?php
6
-					/** This action is documented in wp-includes/theme-compat/embed-content.php */
7
-					do_action( 'embed_content_meta' ); ?>
6
+/** This action is documented in wp-includes/theme-compat/embed-content.php */
7
+do_action( 'embed_content_meta' ); ?>
8 8
 				</div>
9 9
 			</div>
Please login to merge, or discard this patch.
src/bp-templates/bp-nouveau/buddypress/assets/emails/single-bp-email.php 1 patch
Switch Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -157,22 +157,22 @@  discard block
 block discarded – undo
157 157
 				<tr>
158 158
 					<td style="text-align: center; padding: 15px 0; font-family: sans-serif; mso-height-rule: exactly; font-weight: bold; color: <?php echo esc_attr( $settings['header_text_color'] ); ?>; font-size: <?php echo esc_attr( $settings['header_text_size'] . 'px' ); ?>" class="header_text_color header_text_size">
159 159
 						<?php
160
-						/**
160
+/**
161 161
 						 * Fires before the display of the email template header.
162 162
 						 *
163 163
 						 * @since 2.5.0
164 164
 						 */
165
-						do_action( 'bp_before_email_header' );
165
+do_action( 'bp_before_email_header' );
166 166
 
167
-						echo bp_get_option( 'blogname' );
167
+echo bp_get_option( 'blogname' );
168 168
 
169
-						/**
169
+/**
170 170
 						 * Fires after the display of the email template header.
171 171
 						 *
172 172
 						 * @since 2.5.0
173 173
 						 */
174
-						do_action( 'bp_after_email_header' );
175
-						?>
174
+do_action( 'bp_after_email_header' );
175
+?>
176 176
 					</td>
177 177
 				</tr>
178 178
 			</table>
@@ -206,26 +206,26 @@  discard block
 block discarded – undo
206 206
 				<tr>
207 207
 					<td style="padding: 20px; width: 100%; font-size: <?php echo esc_attr( $settings['footer_text_size'] . 'px' ); ?>; font-family: sans-serif; mso-height-rule: exactly; line-height: <?php echo esc_attr( floor( $settings['footer_text_size'] * 1.618 ) . 'px' ) ?>; text-align: <?php echo esc_attr( $settings['direction'] ); ?>; color: <?php echo esc_attr( $settings['footer_text_color'] ); ?>;" class="footer_text_color footer_text_size">
208 208
 						<?php
209
-						/**
209
+/**
210 210
 						 * Fires before the display of the email template footer.
211 211
 						 *
212 212
 						 * @since 2.5.0
213 213
 						 */
214
-						do_action( 'bp_before_email_footer' );
215
-						?>
214
+do_action( 'bp_before_email_footer' );
215
+?>
216 216
 
217 217
 						<span class="footer_text"><?php echo nl2br( stripslashes( $settings['footer_text'] ) ); ?></span>
218 218
 						<br><br>
219 219
 						<a href="{{{unsubscribe}}}" style="text-decoration: underline;"><?php _ex( 'unsubscribe', 'email', 'buddypress' ); ?></a>
220 220
 
221 221
 						<?php
222
-						/**
222
+/**
223 223
 						 * Fires after the display of the email template footer.
224 224
 						 *
225 225
 						 * @since 2.5.0
226 226
 						 */
227
-						do_action( 'bp_after_email_footer' );
228
-						?>
227
+do_action( 'bp_after_email_footer' );
228
+?>
229 229
 					</td>
230 230
 				</tr>
231 231
 			</table>
Please login to merge, or discard this patch.
src/bp-templates/bp-legacy/buddypress/assets/emails/single-bp-email.php 1 patch
Switch Indentation   +12 added lines, -12 removed lines patch added patch discarded remove patch
@@ -157,22 +157,22 @@  discard block
 block discarded – undo
157 157
 				<tr>
158 158
 					<td style="text-align: center; padding: 15px 0; font-family: sans-serif; mso-height-rule: exactly; font-weight: bold; color: <?php echo esc_attr( $settings['header_text_color'] ); ?>; font-size: <?php echo esc_attr( $settings['header_text_size'] . 'px' ); ?>" class="header_text_color header_text_size">
159 159
 						<?php
160
-						/**
160
+		/**
161 161
 						 * Fires before the display of the email template header.
162 162
 						 *
163 163
 						 * @since 2.5.0
164 164
 						 */
165
-						do_action( 'bp_before_email_header' );
165
+		do_action( 'bp_before_email_header' );
166 166
 
167
-						echo bp_get_option( 'blogname' );
167
+		echo bp_get_option( 'blogname' );
168 168
 
169
-						/**
169
+		/**
170 170
 						 * Fires after the display of the email template header.
171 171
 						 *
172 172
 						 * @since 2.5.0
173 173
 						 */
174
-						do_action( 'bp_after_email_header' );
175
-						?>
174
+		do_action( 'bp_after_email_header' );
175
+		?>
176 176
 					</td>
177 177
 				</tr>
178 178
 			</table>
@@ -206,26 +206,26 @@  discard block
 block discarded – undo
206 206
 				<tr>
207 207
 					<td style="padding: 20px; width: 100%; font-size: <?php echo esc_attr( $settings['footer_text_size'] . 'px' ); ?>; font-family: sans-serif; mso-height-rule: exactly; line-height: <?php echo esc_attr( floor( $settings['footer_text_size'] * 1.618 ) . 'px' ) ?>; text-align: <?php echo esc_attr( $settings['direction'] ); ?>; color: <?php echo esc_attr( $settings['footer_text_color'] ); ?>;" class="footer_text_color footer_text_size">
208 208
 						<?php
209
-						/**
209
+		/**
210 210
 						 * Fires before the display of the email template footer.
211 211
 						 *
212 212
 						 * @since 2.5.0
213 213
 						 */
214
-						do_action( 'bp_before_email_footer' );
215
-						?>
214
+		do_action( 'bp_before_email_footer' );
215
+		?>
216 216
 
217 217
 						<span class="footer_text"><?php echo nl2br( stripslashes( $settings['footer_text'] ) ); ?></span>
218 218
 						<br><br>
219 219
 						<a href="{{{unsubscribe}}}" style="text-decoration: underline;"><?php _ex( 'unsubscribe', 'email', 'buddypress' ); ?></a>
220 220
 
221 221
 						<?php
222
-						/**
222
+		/**
223 223
 						 * Fires after the display of the email template footer.
224 224
 						 *
225 225
 						 * @since 2.5.0
226 226
 						 */
227
-						do_action( 'bp_after_email_footer' );
228
-						?>
227
+		do_action( 'bp_after_email_footer' );
228
+		?>
229 229
 					</td>
230 230
 				</tr>
231 231
 			</table>
Please login to merge, or discard this patch.