Skip to content
Permalink

Comparing changes

This is a direct comparison between two commits made in this repository or its related repositories. View the default comparison for this range or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: WordPress/wordpress-develop
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: 56582cee2cc0447ffe0f52d595914d3113c11d68
Choose a base ref
..
head repository: WordPress/wordpress-develop
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: 9dcc63f0f6b89e6dc8f31264ec0c07fa463630cd
Choose a head ref
Showing with 4 additions and 6 deletions.
  1. +2 −2 src/wp-admin/includes/class-wp-list-table.php
  2. +1 −3 src/wp-includes/class-wp-comment-query.php
  3. +1 −1 tools/local-env/scripts/install.js
4 changes: 2 additions & 2 deletions src/wp-admin/includes/class-wp-list-table.php
View file
Original file line number Diff line number Diff line change
@@ -72,10 +72,10 @@ class WP_List_Table {
protected $modes = array();

/**
* Stores the value returned by ->get_column_info().
* Stores the value returned by ::get_column_info().
*
* @since 4.1.0
* @var array
* @var array|null
*/
protected $_column_headers;

4 changes: 1 addition & 3 deletions src/wp-includes/class-wp-comment-query.php
View file
Original file line number Diff line number Diff line change
@@ -579,9 +579,7 @@ protected function get_comment_ids() {
}
}

if ( ! empty( $status_clauses ) ) {
$approved_clauses[] = '( ' . implode( ' OR ', $status_clauses ) . ' )';
}
$approved_clauses[] = '( ' . implode( ' OR ', $status_clauses ) . ' )';
}

// User IDs or emails whose unapproved comments are included, regardless of $status.
2 changes: 1 addition & 1 deletion tools/local-env/scripts/install.js
View file
Original file line number Diff line number Diff line change
@@ -2,7 +2,7 @@ const dotenv = require( 'dotenv' );
const dotenvExpand = require( 'dotenv-expand' );
const wait_on = require( 'wait-on' );
const { execSync } = require( 'child_process' );
const { renameSync, readFileSync, writeFileSync } = require( 'fs' );
const { readFileSync, writeFileSync } = require( 'fs' );
const local_env_utils = require( './utils' );

dotenvExpand.expand( dotenv.config() );