Changeset 57320

Timestamp:

01/20/2024 04:06:31 PM (4 months ago)

Author:

SergeyBiryukov

Message:

Docs: Correct the placement of @global tags in wp-settings.php.

Props shailu25, mukesh27.
Fixes #60146.

File:

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

trunk/src/wp-settings.php

@@ -54 +54 @@
  * configuration. In multisite, it will be overridden by default in ms-settings.php.
  *
+ * @since 2.0.0
+ *
  * @global int $blog_id
- * @since 2.0.0
  */
 global $blog_id;
@@ -117 +118 @@
 
 /**
+ * @since 0.71
+ *
  * @global wpdb $wpdb WordPress database abstraction object.
- * @since 0.71
  */
 global $wpdb;
@@ -525 +527 @@
  * WordPress Query object
  *
+ * @since 2.0.0
+ *
  * @global WP_Query $wp_the_query WordPress Query object.
- * @since 2.0.0
  */
 $GLOBALS['wp_the_query'] = new WP_Query();
@@ -534 +537 @@
  * Use this global for WordPress queries
  *
+ * @since 1.5.0
+ *
  * @global WP_Query $wp_query WordPress Query object.
+ */
+$GLOBALS['wp_query'] = $GLOBALS['wp_the_query'];
+
+/**
+ * Holds the WordPress Rewrite object for creating pretty URLs
+ *
  * @since 1.5.0
- */
-$GLOBALS['wp_query'] = $GLOBALS['wp_the_query'];
-
-/**
- * Holds the WordPress Rewrite object for creating pretty URLs
  *
  * @global WP_Rewrite $wp_rewrite WordPress rewrite component.
- * @since 1.5.0
  */
 $GLOBALS['wp_rewrite'] = new WP_Rewrite();
@@ -550 +555 @@
  * WordPress Object
  *
+ * @since 2.0.0
+ *
  * @global WP $wp Current WordPress environment instance.
+ */
+$GLOBALS['wp'] = new WP();
+
+/**
+ * WordPress Widget Factory Object
+ *
+ * @since 2.8.0
+ *
+ * @global WP_Widget_Factory $wp_widget_factory
+ */
+$GLOBALS['wp_widget_factory'] = new WP_Widget_Factory();
+
+/**
+ * WordPress User Roles
+ *
  * @since 2.0.0
- */
-$GLOBALS['wp'] = new WP();
-
-/**
- * WordPress Widget Factory Object
- *
- * @global WP_Widget_Factory $wp_widget_factory
- * @since 2.8.0
- */
-$GLOBALS['wp_widget_factory'] = new WP_Widget_Factory();
-
-/**
- * WordPress User Roles
  *
  * @global WP_Roles $wp_roles WordPress role management object.
- * @since 2.0.0
  */
 $GLOBALS['wp_roles'] = new WP_Roles();
@@ -594 +602 @@
  * WordPress Locale object for loading locale domain date and various strings.
  *
+ * @since 2.1.0
+ *
  * @global WP_Locale $wp_locale WordPress date and time locale object.
- * @since 2.1.0
  */
 $GLOBALS['wp_locale'] = new WP_Locale();