Changeset 28814

Timestamp:

06/24/2014 12:23:09 AM (10 years ago)

Author:

wonderboymusic

Message:

In $wpdb->update(), prevent explosions when $where is empty.

Adds unit tests.

Props UmeshSingla, wonderboymusic.
Fixes #26106

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

@@ -1786 +1786 @@
         }
 
-        $sql = "UPDATE `$table` SET " . implode( ', ', $bits ) . ' WHERE ' . implode( ' AND ', $wheres );
+        $wheres = empty( $where ) ? '' : ( ' WHERE ' . implode( ' AND ', $wheres ) );
+
+        $sql = "UPDATE `$table` SET " . implode( ', ', $bits ) . $wheres;
         return $this->query( $this->prepare( $sql, array_merge( array_values( $data ), array_values( $where ) ) ) );
     }

trunk/tests/phpunit/tests/db.php

@@ -437 +437 @@
         $this->assertEquals( 'Walter Replace Sobchak', $row->display_name );
     }
+
+    /**
+     *
+     * @ticket 26106
+     */
+    function test_empty_where() {
+        global $wpdb;
+        $wpdb->update( $wpdb->posts, array( 'post_name' => 'burrito' ), array() );
+
+        $expected1 = "UPDATE `{$wpdb->posts}` SET `post_name` = 'burrito'";
+        $this->assertEquals( $expected1, $wpdb->last_query );
+
+        $wpdb->update( $wpdb->posts, array( 'post_name' => 'burrito' ), array( 'post_status' => 'taco' ) );
+
+        $expected2 = "UPDATE `{$wpdb->posts}` SET `post_name` = 'burrito' WHERE `post_status` = 'taco'";
+        $this->assertEquals( $expected2, $wpdb->last_query );
+    }
 }