Ticket #51439: 51439.diff

src/wp-admin/edit-comments.php

@@ -25 +25 @@
         check_admin_referer( 'bulk-comments' );
 
         if ( 'delete_all' === $doaction && ! empty( $_REQUEST['pagegen_timestamp'] ) ) {
+                /**
+                 * @global wpdb $wpdb WordPress database abstraction object.
+                 */
+                global $wpdb;
+
                 $comment_status = wp_unslash( $_REQUEST['comment_status'] );
                 $delete_time    = wp_unslash( $_REQUEST['pagegen_timestamp'] );
                 $comment_ids    = $wpdb->get_col( $wpdb->prepare( "SELECT comment_ID FROM $wpdb->comments WHERE comment_approved = %s AND %s > comment_date_gmt", $comment_status, $delete_time ) );
@@ -135 +140 @@
 wp_enqueue_script( 'admin-comments' );
 enqueue_comment_hotkeys_js();
 
+/**
+ * @global int $post_id
+ */
+global $post_id;
+
 if ( $post_id ) {
         $comments_count      = wp_count_comments( $post_id );
         $draft_or_post_title = wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '…' );

src/wp-admin/edit-form-comment.php

@@ -10 +10 @@
 if ( ! defined( 'ABSPATH' ) ) {
         die( '-1' );
 }
+
+/**
+ * @global WP_Comment $comment Global comment object.
+ */
+global $comment;
 ?>
 <form name="post" action="comment.php" method="post" id="post">
 <?php wp_nonce_field( 'update-comment_' . $comment->comment_ID ); ?>
@@ -139 +144 @@
 <a href="#edit_timestamp" class="edit-timestamp hide-if-no-js"><span aria-hidden="true"><?php _e( 'Edit' ); ?></span> <span class="screen-reader-text"><?php _e( 'Edit date and time' ); ?></span></a>
 <fieldset id='timestampdiv' class='hide-if-js'>
 <legend class="screen-reader-text"><?php _e( 'Date and time' ); ?></legend>
-<?php touch_time( ( 'editcomment' === $action ), 0 ); ?>
+<?php
+/**
+ * @global string $action
+ */
+global $action;
+
+touch_time( ( 'editcomment' === $action ), 0 );
+?>
 </fieldset>
 </div>
 

src/wp-admin/edit.php

@@ -9 +9 @@
 /** WordPress Administration Bootstrap */
 require_once __DIR__ . '/admin.php';
 
+/**
+ * @global string $typenow
+ */
+global $typenow;
+
 if ( ! $typenow ) {
         wp_die( __( 'Invalid post type.' ) );
 }
@@ -87 +92 @@
                 $post_status = preg_replace( '/[^a-z0-9_-]+/i', '', $_REQUEST['post_status'] );
                 // Validate the post status exists.
                 if ( get_post_status_object( $post_status ) ) {
+                        /**
+                         * @global wpdb $wpdb WordPress database abstraction object.
+                         */
+                        global $wpdb;
+
                         $post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type=%s AND post_status = %s", $post_type, $post_status ) );
                 }
                 $doaction = 'delete';

src/wp-admin/install.php

@@ -225 +225 @@
  * @global string $wp_version             The WordPress version string.
  * @global string $required_php_version   The required PHP version string.
  * @global string $required_mysql_version The required MySQL version string.
+ * @global wpdb   $wpdb                   WordPress database abstraction object.
  */
-global $wp_version, $required_php_version, $required_mysql_version;
+global $wp_version, $required_php_version, $required_mysql_version, $wpdb;
 
 $php_version   = phpversion();
 $mysql_version = $wpdb->db_version();

src/wp-admin/upgrade.php

@@ -39 +39 @@
  * @global string $wp_version             The WordPress version string.
  * @global string $required_php_version   The required PHP version string.
  * @global string $required_mysql_version The required MySQL version string.
+ * @global wpdb   $wpdb                   WordPress database abstraction object.
  */
-global $wp_version, $required_php_version, $required_mysql_version;
+global $wp_version, $required_php_version, $required_mysql_version, $wpdb;
 
 $step = (int) $step;