vhad/wordpress-develop
1
0
Fork 0
mirror of https://github.com/gosticks/wordpress-develop.git synced 2026-10-04 06:37:06 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Database: Restore numbered placeholders in wpdb::prepare().

Browse Source 
[41496] removed support for numbered placeholders in queries send through `wpdb::prepare()`, which, despite being undocumented, were quite commonly used.

This change restores support for numbered placeholders (as well as a subset of placeholder formatting), while also adding extra checks to ensure the correct number of arguments are being passed to `wpdb::prepare()`, given the number of placeholders.

See #41925.



git-svn-id: https://develop.svn.wordpress.org/trunk@42056 602fd350-edb4-49c9-b593-d223f7449a82
This commit is contained in:
Gary Pendergast
2017-10-31 11:59:43 +00:00
parent 15f74e83fa
commit a39d599adf
9 changed files with 492 additions and 53 deletions
Download Patch File Download Diff File Expand all files Collapse all files
tests/phpunit/tests/date/query.php
+8 -4
View File
@@ -512,11 +512,12 @@ class Tests_WP_Date_Query extends WP_UnitTestCase {
* @ticket 34228
*/
public function test_build_time_query_should_not_discard_hour_0() {
global $wpdb;
$q = new WP_Date_Query( array() );
$found = $q->build_time_query( 'post_date', '=', 0, 10 );
$this->assertContains( '%H', $found );
$this->assertContains( '%H', $wpdb->remove_placeholder_escape( $found ) );
}
public function test_build_time_query_compare_in() {
@@ -612,33 +613,36 @@ class Tests_WP_Date_Query extends WP_UnitTestCase {
}
public function test_build_time_query_hour_minute() {
global $wpdb;
$q = new WP_Date_Query( array() );
$found = $q->build_time_query( 'post_date', '=', 5, 15 );
// $compare value is floating point - use regex to account for
// varying precision on different PHP installations
$this->assertRegExp( "/DATE_FORMAT\( post_date, '%H\.%i' \) = 5\.150*/", $found );
$this->assertRegExp( "/DATE_FORMAT\( post_date, '%H\.%i' \) = 5\.150*/", $wpdb->remove_placeholder_escape( $found ) );
}
public function test_build_time_query_hour_minute_second() {
global $wpdb;
$q = new WP_Date_Query( array() );
$found = $q->build_time_query( 'post_date', '=', 5, 15, 35 );
// $compare value is floating point - use regex to account for
// varying precision on different PHP installations
$this->assertRegExp( "/DATE_FORMAT\( post_date, '%H\.%i%s' \) = 5\.15350*/", $found );
$this->assertRegExp( "/DATE_FORMAT\( post_date, '%H\.%i%s' \) = 5\.15350*/", $wpdb->remove_placeholder_escape( $found ) );
}
public function test_build_time_query_minute_second() {
global $wpdb;
$q = new WP_Date_Query( array() );
$found = $q->build_time_query( 'post_date', '=', null, 15, 35 );
// $compare value is floating point - use regex to account for
// varying precision on different PHP installations
$this->assertRegExp( "/DATE_FORMAT\( post_date, '0\.%i%s' \) = 0\.15350*/", $found );
$this->assertRegExp( "/DATE_FORMAT\( post_date, '0\.%i%s' \) = 0\.15350*/", $wpdb->remove_placeholder_escape( $found ) );
}
/**