<!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>[55857] trunk/src: Coding Standards: Improve formatting of some SQL queries for better readability.</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/55857">55857</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/55857","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>2023-05-25 12:53:24 +0000 (Thu, 25 May 2023)</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'>Coding Standards: Improve formatting of some SQL queries for better readability.
This corrects the placement of double quotes around the query and makes sure the alignment is consistent.
Props umeshmcakadi, mukesh27, krupalpanchal, dhrumilk, SergeyBiryukov.
Fixes <a href="https://core.trac.wordpress.org/ticket/58372">#58372</a>.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunksrcwpadminexportphp">trunk/src/wp-admin/export.php</a></li>
<li><a href="#trunksrcwpadminincludesclasswplisttablephp">trunk/src/wp-admin/includes/class-wp-list-table.php</a></li>
<li><a href="#trunksrcwpadminincludespostphp">trunk/src/wp-admin/includes/post.php</a></li>
<li><a href="#trunksrcwpincludesclasswptaxqueryphp">trunk/src/wp-includes/class-wp-tax-query.php</a></li>
<li><a href="#trunksrcwpincludesclasswpuserqueryphp">trunk/src/wp-includes/class-wp-user-query.php</a></li>
<li><a href="#trunksrcwpincludesdeprecatedphp">trunk/src/wp-includes/deprecated.php</a></li>
<li><a href="#trunksrcwpincludesgeneraltemplatephp">trunk/src/wp-includes/general-template.php</a></li>
<li><a href="#trunksrcwpincludesmediaphp">trunk/src/wp-includes/media.php</a></li>
<li><a href="#trunksrcwpincludesuserphp">trunk/src/wp-includes/user.php</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunksrcwpadminexportphp"></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/export.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/export.php 2023-05-25 10:53:52 UTC (rev 55856)
+++ trunk/src/wp-admin/export.php 2023-05-25 12:53:24 UTC (rev 55857)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -141,12 +141,10 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $months = $wpdb->get_results(
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->prepare(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "
- SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
- FROM $wpdb->posts
- WHERE post_type = %s AND post_status != 'auto-draft'
- ORDER BY post_date DESC
- ",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
+ FROM $wpdb->posts
+ WHERE post_type = %s AND post_status != 'auto-draft'
+ ORDER BY post_date DESC",
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_type
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpadminincludesclasswplisttablephp"></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/includes/class-wp-list-table.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/class-wp-list-table.php 2023-05-25 10:53:52 UTC (rev 55856)
+++ trunk/src/wp-admin/includes/class-wp-list-table.php 2023-05-25 12:53:24 UTC (rev 55857)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -698,13 +698,11 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $months = $wpdb->get_results(
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->prepare(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "
- SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
- FROM $wpdb->posts
- WHERE post_type = %s
- $extra_checks
- ORDER BY post_date DESC
- ",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
+ FROM $wpdb->posts
+ WHERE post_type = %s
+ $extra_checks
+ ORDER BY post_date DESC",
</ins><span class="cx" style="display: block; padding: 0 10px"> $post_type
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpadminincludespostphp"></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/includes/post.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-admin/includes/post.php 2023-05-25 10:53:52 UTC (rev 55856)
+++ trunk/src/wp-admin/includes/post.php 2023-05-25 12:53:24 UTC (rev 55857)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1010,11 +1010,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> global $wpdb;
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $keys = $wpdb->get_col(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "
- SELECT meta_key
- FROM $wpdb->postmeta
- GROUP BY meta_key
- ORDER BY meta_key"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "SELECT meta_key
+ FROM $wpdb->postmeta
+ GROUP BY meta_key
+ ORDER BY meta_key"
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> return $keys;
</span></span></pre></div>
<a id="trunksrcwpincludesclasswptaxqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-tax-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-tax-query.php 2023-05-25 10:53:52 UTC (rev 55856)
+++ trunk/src/wp-includes/class-wp-tax-query.php 2023-05-25 12:53:24 UTC (rev 55857)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -466,13 +466,13 @@
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> $where = $wpdb->prepare(
</span><span class="cx" style="display: block; padding: 0 10px"> "$operator (
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- SELECT 1
- FROM $wpdb->term_relationships
- INNER JOIN $wpdb->term_taxonomy
- ON $wpdb->term_taxonomy.term_taxonomy_id = $wpdb->term_relationships.term_taxonomy_id
- WHERE $wpdb->term_taxonomy.taxonomy = %s
- AND $wpdb->term_relationships.object_id = $this->primary_table.$this->primary_id_column
- )",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ SELECT 1
+ FROM $wpdb->term_relationships
+ INNER JOIN $wpdb->term_taxonomy
+ ON $wpdb->term_taxonomy.term_taxonomy_id = $wpdb->term_relationships.term_taxonomy_id
+ WHERE $wpdb->term_taxonomy.taxonomy = %s
+ AND $wpdb->term_relationships.object_id = $this->primary_table.$this->primary_id_column
+ )",
</ins><span class="cx" style="display: block; padding: 0 10px"> $clause['taxonomy']
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span></span></pre></div>
<a id="trunksrcwpincludesclasswpuserqueryphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/class-wp-user-query.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/class-wp-user-query.php 2023-05-25 10:53:52 UTC (rev 55856)
+++ trunk/src/wp-includes/class-wp-user-query.php 2023-05-25 12:53:24 UTC (rev 55857)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -1009,8 +1009,7 @@
</span><span class="cx" style="display: block; padding: 0 10px"> FROM $wpdb->posts
</span><span class="cx" style="display: block; padding: 0 10px"> $where
</span><span class="cx" style="display: block; padding: 0 10px"> GROUP BY post_author
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ) p ON ({$wpdb->users}.ID = p.post_author)
- ";
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ) p ON ({$wpdb->users}.ID = p.post_author)";
</ins><span class="cx" style="display: block; padding: 0 10px"> $_orderby = 'post_count';
</span><span class="cx" style="display: block; padding: 0 10px"> } elseif ( 'ID' === $orderby || 'id' === $orderby ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $_orderby = 'ID';
</span></span></pre></div>
<a id="trunksrcwpincludesdeprecatedphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/deprecated.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/deprecated.php 2023-05-25 10:53:52 UTC (rev 55856)
+++ trunk/src/wp-includes/deprecated.php 2023-05-25 12:53:24 UTC (rev 55857)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4562,22 +4562,18 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type = esc_sql( $post_type );
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type_in_string = "'" . implode( "','", $post_type ) . "'";
</span><span class="cx" style="display: block; padding: 0 10px"> $sql = $wpdb->prepare(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "
- SELECT ID
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "SELECT ID
</ins><span class="cx" style="display: block; padding: 0 10px"> FROM $wpdb->posts
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE post_title = %s
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- AND post_type IN ($post_type_in_string)
- ",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ AND post_type IN ($post_type_in_string)",
</ins><span class="cx" style="display: block; padding: 0 10px"> $page_title
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> } else {
</span><span class="cx" style="display: block; padding: 0 10px"> $sql = $wpdb->prepare(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "
- SELECT ID
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "SELECT ID
</ins><span class="cx" style="display: block; padding: 0 10px"> FROM $wpdb->posts
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE post_title = %s
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- AND post_type = %s
- ",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ AND post_type = %s",
</ins><span class="cx" style="display: block; padding: 0 10px"> $page_title,
</span><span class="cx" style="display: block; padding: 0 10px"> $post_type
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpincludesgeneraltemplatephp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/general-template.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/general-template.php 2023-05-25 10:53:52 UTC (rev 55856)
+++ trunk/src/wp-includes/general-template.php 2023-05-25 12:53:24 UTC (rev 55857)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2298,8 +2298,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> FROM $wpdb->posts
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE post_date < '$thisyear-$thismonth-01'
</span><span class="cx" style="display: block; padding: 0 10px"> AND post_type = 'post' AND post_status = 'publish'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ORDER BY post_date DESC
- LIMIT 1"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ORDER BY post_date DESC
+ LIMIT 1"
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> $next = $wpdb->get_row(
</span><span class="cx" style="display: block; padding: 0 10px"> "SELECT MONTH(post_date) AS month, YEAR(post_date) AS year
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -2306,8 +2306,8 @@
</span><span class="cx" style="display: block; padding: 0 10px"> FROM $wpdb->posts
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE post_date > '$thisyear-$thismonth-{$last_day} 23:59:59'
</span><span class="cx" style="display: block; padding: 0 10px"> AND post_type = 'post' AND post_status = 'publish'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- ORDER BY post_date ASC
- LIMIT 1"
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ ORDER BY post_date ASC
+ LIMIT 1"
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="cx" style="display: block; padding: 0 10px"> /* translators: Calendar caption: 1: Month name, 2: 4-digit year. */
</span></span></pre></div>
<a id="trunksrcwpincludesmediaphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/media.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/media.php 2023-05-25 10:53:52 UTC (rev 55856)
+++ trunk/src/wp-includes/media.php 2023-05-25 12:53:24 UTC (rev 55857)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4484,13 +4484,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $show_audio_playlist = apply_filters( 'media_library_show_audio_playlist', true );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( null === $show_audio_playlist ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $show_audio_playlist = $wpdb->get_var(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "
- SELECT ID
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "SELECT ID
</ins><span class="cx" style="display: block; padding: 0 10px"> FROM $wpdb->posts
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE post_type = 'attachment'
</span><span class="cx" style="display: block; padding: 0 10px"> AND post_mime_type LIKE 'audio%'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- LIMIT 1
- "
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ LIMIT 1"
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4514,13 +4512,11 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $show_video_playlist = apply_filters( 'media_library_show_video_playlist', true );
</span><span class="cx" style="display: block; padding: 0 10px"> if ( null === $show_video_playlist ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $show_video_playlist = $wpdb->get_var(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "
- SELECT ID
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "SELECT ID
</ins><span class="cx" style="display: block; padding: 0 10px"> FROM $wpdb->posts
</span><span class="cx" style="display: block; padding: 0 10px"> WHERE post_type = 'attachment'
</span><span class="cx" style="display: block; padding: 0 10px"> AND post_mime_type LIKE 'video%'
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- LIMIT 1
- "
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ LIMIT 1"
</ins><span class="cx" style="display: block; padding: 0 10px"> );
</span><span class="cx" style="display: block; padding: 0 10px"> }
</span><span class="cx" style="display: block; padding: 0 10px">
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -4543,12 +4539,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> if ( ! is_array( $months ) ) {
</span><span class="cx" style="display: block; padding: 0 10px"> $months = $wpdb->get_results(
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->prepare(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "
- SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
- FROM $wpdb->posts
- WHERE post_type = %s
- ORDER BY post_date DESC
- ",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "SELECT DISTINCT YEAR( post_date ) AS year, MONTH( post_date ) AS month
+ FROM $wpdb->posts
+ WHERE post_type = %s
+ ORDER BY post_date DESC",
</ins><span class="cx" style="display: block; padding: 0 10px"> 'attachment'
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre></div>
<a id="trunksrcwpincludesuserphp"></a>
<div class="modfile"><h4 style="background-color: #eee; color: inherit; margin: 1em 0; padding: 1.3em; font-size: 115%">Modified: trunk/src/wp-includes/user.php</h4>
<pre class="diff"><span>
<span class="info" style="display: block; padding: 0 10px; color: #888">--- trunk/src/wp-includes/user.php 2023-05-25 10:53:52 UTC (rev 55856)
+++ trunk/src/wp-includes/user.php 2023-05-25 12:53:24 UTC (rev 55857)
</span><span class="lines" style="display: block; padding: 0 10px; color: #888">@@ -3545,12 +3545,10 @@
</span><span class="cx" style="display: block; padding: 0 10px"> $regex = preg_replace( '/[^a-zA-Z_\|-]/', '', $regex );
</span><span class="cx" style="display: block; padding: 0 10px"> $users = $wpdb->get_col(
</span><span class="cx" style="display: block; padding: 0 10px"> $wpdb->prepare(
</span><del style="background-color: #fdd; text-decoration:none; display:block; padding: 0 10px">- "
- SELECT user_id
- FROM $wpdb->usermeta
- WHERE meta_key = '{$prefix}capabilities'
- AND meta_value NOT REGEXP %s
- ",
</del><ins style="background-color: #dfd; text-decoration:none; display:block; padding: 0 10px">+ "SELECT user_id
+ FROM $wpdb->usermeta
+ WHERE meta_key = '{$prefix}capabilities'
+ AND meta_value NOT REGEXP %s",
</ins><span class="cx" style="display: block; padding: 0 10px"> $regex
</span><span class="cx" style="display: block; padding: 0 10px"> )
</span><span class="cx" style="display: block; padding: 0 10px"> );
</span></span></pre>
</div>
</div>
</body>
</html>