<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[53450] trunk/src/wp-admin: Docs: Explicitly declare some globals for clarity.</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { white-space: pre-line; overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta" style="font-size: 105%">
<dt style="float: left; width: 6em; font-weight: bold">Revision</dt> <dd><a style="font-weight: bold" href="https://core.trac.wordpress.org/changeset/53450">53450</a><script type="application/ld+json">{"@context":"http://schema.org","@type":"EmailMessage","description":"Review this Commit","action":{"@type":"ViewAction","url":"https://core.trac.wordpress.org/changeset/53450","name":"Review Commit"}}</script></dd>
<dt style="float: left; width: 6em; font-weight: bold">Author</dt> <dd>SergeyBiryukov</dd>
<dt style="float: left; width: 6em; font-weight: bold">Date</dt> <dd>2022-05-29 15:33:12 +0000 (Sun, 29 May 2022)</dd>
</dl>
<pre style='padding-left: 1em; margin: 2em 0; border-left: 2px solid #ccc; line-height: 1.25; font-size: 105%; font-family: sans-serif'>Docs: Explicitly declare some globals for clarity.
This aims to improve developer experience by making it clear that these variables are defined elsewhere.
Props ravipatel, davidbaumwald, hellofromTonya, costdev, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/51439">#51439</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadmineditcommentsphp">trunk/src/wp-admin/edit-comments.php</a></li>
<li><a href="#trunksrcwpadmineditformcommentphp">trunk/src/wp-admin/edit-form-comment.php</a></li>
<li><a href="#trunksrcwpadmineditphp">trunk/src/wp-admin/edit.php</a></li>
<li><a href="#trunksrcwpadmininstallphp">trunk/src/wp-admin/install.php</a></li>
<li><a href="#trunksrcwpadminupgradephp">trunk/src/wp-admin/upgrade.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadmineditcommentsphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit-comments.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-comments.php 2022-05-27 15:49:24 UTC (rev 53449)
+++ trunk/src/wp-admin/edit-comments.php 2022-05-29 15:33:12 UTC (rev 53450)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -25,6 +25,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> check_admin_referer( 'bulk-comments' );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> if ( 'delete_all' === $doaction && ! empty( $_REQUEST['pagegen_timestamp'] ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @global wpdb $wpdb WordPress database abstraction object.
+ */
+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $comment_status = wp_unslash( $_REQUEST['comment_status'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $delete_time = wp_unslash( $_REQUEST['pagegen_timestamp'] );
</span><span class="cx" style="display: block; padding: 0 10px"> $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 ) );
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -135,6 +140,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> wp_enqueue_script( 'admin-comments' );
</span><span class="cx" style="display: block; padding: 0 10px"> enqueue_comment_hotkeys_js();
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * @global int $post_id
+ */
+global $post_id;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( $post_id ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $comments_count = wp_count_comments( $post_id );
</span><span class="cx" style="display: block; padding: 0 10px"> $draft_or_post_title = wp_html_excerpt( _draft_or_post_title( $post_id ), 50, '…' );
</span></span></pre></div>
<a id="trunksrcwpadmineditformcommentphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit-form-comment.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit-form-comment.php 2022-05-27 15:49:24 UTC (rev 53449)
+++ trunk/src/wp-admin/edit-form-comment.php 2022-05-29 15:33:12 UTC (rev 53450)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -10,6 +10,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! defined( 'ABSPATH' ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> die( '-1' );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+
+/**
+ * @global WP_Comment $comment Global comment object.
+ */
+global $comment;
</ins><span class="cx" style="display: block; padding: 0 10px"> ?>
</span><span class="cx" style="display: block; padding: 0 10px"> <form name="post" action="comment.php" method="post" id="post">
</span><span class="cx" style="display: block; padding: 0 10px"> <?php wp_nonce_field( 'update-comment_' . $comment->comment_ID ); ?>
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -139,7 +144,14 @@
</span><span class="cx" style="display: block; padding: 0 10px"> <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>
</span><span class="cx" style="display: block; padding: 0 10px"> <fieldset id='timestampdiv' class='hide-if-js'>
</span><span class="cx" style="display: block; padding: 0 10px"> <legend class="screen-reader-text"><?php _e( 'Date and time' ); ?></legend>
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-<?php touch_time( ( 'editcomment' === $action ), 0 ); ?>
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+<?php
+/**
+ * @global string $action
+ */
+global $action;
+
+touch_time( ( 'editcomment' === $action ), 0 );
+?>
</ins><span class="cx" style="display: block; padding: 0 10px"> </fieldset>
</span><span class="cx" style="display: block; padding: 0 10px"> </div>
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpadmineditphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/edit.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/edit.php 2022-05-27 15:49:24 UTC (rev 53449)
+++ trunk/src/wp-admin/edit.php 2022-05-29 15:33:12 UTC (rev 53450)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -9,6 +9,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> /** WordPress Administration Bootstrap */
</span><span class="cx" style="display: block; padding: 0 10px"> require_once __DIR__ . '/admin.php';
</span><span class="cx" style="display: block; padding: 0 10px">
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+/**
+ * @global string $typenow The post type of the current screen.
+ */
+global $typenow;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> if ( ! $typenow ) {
</span><span class="cx" style="display: block; padding: 0 10px"> wp_die( __( 'Invalid post type.' ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -87,6 +92,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_status = preg_replace( '/[^a-z0-9_-]+/i', '', $_REQUEST['post_status'] );
</span><span class="cx" style="display: block; padding: 0 10px"> // Validate the post status exists.
</span><span class="cx" style="display: block; padding: 0 10px"> if ( get_post_status_object( $post_status ) ) {
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ /**
+ * @global wpdb $wpdb WordPress database abstraction object.
+ */
+ global $wpdb;
+
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_ids = $wpdb->get_col( $wpdb->prepare( "SELECT ID FROM $wpdb->posts WHERE post_type=%s AND post_status = %s", $post_type, $post_status ) );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px"> $doaction = 'delete';
</span></span></pre></div>
<a id="trunksrcwpadmininstallphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/install.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/install.php 2022-05-27 15:49:24 UTC (rev 53449)
+++ trunk/src/wp-admin/install.php 2022-05-29 15:33:12 UTC (rev 53450)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -225,8 +225,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $wp_version The WordPress version string.
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $required_php_version The required PHP version string.
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $required_mysql_version The required MySQL version string.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb WordPress database abstraction object.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-global $wp_version, $required_php_version, $required_mysql_version;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+global $wp_version, $required_php_version, $required_mysql_version, $wpdb;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $php_version = PHP_VERSION;
</span><span class="cx" style="display: block; padding: 0 10px"> $mysql_version = $wpdb->db_version();
</span></span></pre></div>
<a id="trunksrcwpadminupgradephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-admin/upgrade.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/upgrade.php 2022-05-27 15:49:24 UTC (rev 53449)
+++ trunk/src/wp-admin/upgrade.php 2022-05-29 15:33:12 UTC (rev 53450)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -39,8 +39,9 @@
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $wp_version The WordPress version string.
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $required_php_version The required PHP version string.
</span><span class="cx" style="display: block; padding: 0 10px"> * @global string $required_mysql_version The required MySQL version string.
</span><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ * @global wpdb $wpdb WordPress database abstraction object.
</ins><span class="cx" style="display: block; padding: 0 10px"> */
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">-global $wp_version, $required_php_version, $required_mysql_version;
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+global $wp_version, $required_php_version, $required_mysql_version, $wpdb;
</ins><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $step = (int) $step;
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre>
</div>
</div>
</body>
</html>