Changeset 42343 for trunk/src/wp-settings.php

Timestamp:

11/30/2017 11:09:33 PM (3 years ago)

Author:

pento

Message:

Code is Poetry.
WordPress' code just... wasn't.
This is now dealt with.

Props jrf, pento, netweb, GaryJ, jdgrimes, westonruter, Greg Sherwood from PHPCS, and everyone who's ever contributed to WPCS and PHPCS.
Fixes #41057.

File:

• trunk/src/wp-settings.php (modified) (13 diffs)

trunk/src/wp-settings.php

@@ -46 +46 @@
 // Disable magic quotes at runtime. Magic quotes are added using wpdb later in wp-settings.php.
 @ini_set( 'magic_quotes_runtime', 0 );
-@ini_set( 'magic_quotes_sybase',  0 );
+@ini_set( 'magic_quotes_sybase', 0 );
 
 // WordPress calculates offsets from UTC.
@@ -129 +129 @@
 
 // Stop most of WordPress from being loaded if we just want the basics.
-if ( SHORTINIT )
+if ( SHORTINIT ) {
     return false;
+}
 
 // Load the L10n library.
@@ -278 +279 @@
 do_action( 'muplugins_loaded' );
 
-if ( is_multisite() )
-    ms_cookie_constants(  );
+if ( is_multisite() ) {
+    ms_cookie_constants();
+}
 
 // Define constants after multisite is loaded.
@@ -315 +317 @@
 
 // Run wp_cache_postload() if object cache is enabled and the function exists.
-if ( WP_CACHE && function_exists( 'wp_cache_postload' ) )
+if ( WP_CACHE && function_exists( 'wp_cache_postload' ) ) {
     wp_cache_postload();
+}
 
 /**
@@ -342 +345 @@
 /**
  * WordPress Query object
+ *
  * @global WP_Query $wp_the_query
  * @since 2.0.0
@@ -350 +354 @@
  * Holds the reference to @see $wp_the_query
  * Use this global for WordPress queries
+ *
  * @global WP_Query $wp_query
  * @since 1.5.0
@@ -357 +362 @@
 /**
  * Holds the WordPress Rewrite object for creating pretty URLs
+ *
  * @global WP_Rewrite $wp_rewrite
  * @since 1.5.0
@@ -364 +370 @@
 /**
  * WordPress Object
+ *
  * @global WP $wp
  * @since 2.0.0
@@ -371 +378 @@
 /**
  * WordPress Widget Factory Object
+ *
  * @global WP_Widget_Factory $wp_widget_factory
  * @since 2.8.0
@@ -378 +386 @@
 /**
  * WordPress User Roles
+ *
  * @global WP_Roles $wp_roles
  * @since 2.0.0
@@ -391 +400 @@
 
 // Define the template related constants.
-wp_templating_constants(  );
+wp_templating_constants();
 
 // Load the default text localization domain.
 load_default_textdomain();
 
-$locale = get_locale();
+$locale      = get_locale();
 $locale_file = WP_LANG_DIR . "/$locale.php";
-if ( ( 0 === validate_file( $locale ) ) && is_readable( $locale_file ) )
+if ( ( 0 === validate_file( $locale ) ) && is_readable( $locale_file ) ) {
     require( $locale_file );
+}
 unset( $locale_file );
 
 /**
  * WordPress Locale object for loading locale domain date and various strings.
+ *
  * @global WP_Locale $wp_locale
  * @since 2.1.0
@@ -421 +432 @@
 // Load the functions for the active theme, for both parent and child theme if applicable.
 if ( ! wp_installing() || 'wp-activate.php' === $pagenow ) {
-    if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) )
+    if ( TEMPLATEPATH !== STYLESHEETPATH && file_exists( STYLESHEETPATH . '/functions.php' ) ) {
         include( STYLESHEETPATH . '/functions.php' );
-    if ( file_exists( TEMPLATEPATH . '/functions.php' ) )
+    }
+    if ( file_exists( TEMPLATEPATH . '/functions.php' ) ) {
         include( TEMPLATEPATH . '/functions.php' );
+    }
 }
 
@@ -456 +469 @@
         die();
     }
-    unset($file);
+    unset( $file );
 }