Changeset 27073

Timestamp:

02/02/2014 09:46:07 PM (11 years ago)

Author:

nacin

Message:

Throw an incorrect usage notice when the query argument of wpdb::prepare() does not include a placeholder.

props ounziw.
fixes #25604.

Location:

trunk

Files:

• src/wp-includes/wp-db.php (modified) (1 diff)
• tests/phpunit/tests/db.php (modified) (1 diff)

trunk/src/wp-includes/wp-db.php

@@ -1053 +1053 @@
         if ( is_null( $query ) )
             return;
+
+        if ( strpos( $query, '%' ) === false ) {
+            _doing_it_wrong( 'wpdb::prepare', sprintf( __( 'The query argument of %s must have a placeholder.' ), 'wpdb::prepare()' ), '3.9' );
+        }
 
         $args = func_get_args();

trunk/tests/phpunit/tests/db.php

@@ -194 +194 @@
         return $modes;
     }
+
+    /**
+     * @ticket 25604
+     * @expectedIncorrectUsage wpdb::prepare
+     */
+    function test_prepare_without_arguments() {
+        global $wpdb;
+        $id = 0;
+        // This, obviously, is an incorrect prepare.
+        $prepared = $wpdb->prepare( "SELECT * FROM $wpdb->users WHERE id = $id", $id );
+        $this->assertEquals( "SELECT * FROM $wpdb->users WHERE id = 0", $prepared );
+    }
 }