Changeset 20287 for trunk/wp-includes/ms-functions.php

Timestamp:

03/24/2012 03:24:31 PM (13 years ago)

Author:

nacin

Message:

Introduce $wpdb->delete(). props justindgivens, scribu. fixes #18948.

File:

• trunk/wp-includes/ms-functions.php (modified) (4 diffs)

trunk/wp-includes/ms-functions.php

@@ -497 +497 @@
         // If registered more than two days ago, cancel registration and let this signup go through.
         if ( $diff > 172800 )
-            $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->signups WHERE user_login = %s", $user_name) );
+            $wpdb->delete( $wpdb->signups, array( 'user_login' => $user_name ) );
         else
             $errors->add('user_name', __('That username is currently reserved but may be available in a couple of days.'));
@@ -510 +510 @@
         // If registered more than two days ago, cancel registration and let this signup go through.
         if ( $diff > 172800 )
-            $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->signups WHERE user_email = %s", $user_email) );
+            $wpdb->delete( $wpdb->signups, array( 'user_email' => $user_email ) );
         else
             $errors->add('user_email', __('That email address has already been used. Please check your inbox for an activation email. It will become available in a couple of days if you do nothing.'));
@@ -613 +613 @@
         // If registered more than two days ago, cancel registration and let this signup go through.
         if ( $diff > 172800 )
-            $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->signups WHERE domain = %s AND path = %s", $mydomain, $path) );
+            $wpdb->delete( $wpdb->signups, array( 'domain' => $mydomain , 'path' => $path ) );
         else
             $errors->add('blogname', __('That site is currently reserved but may be available in a couple days.'));
@@ -1161 +1161 @@
 
     // remove all perms
-    $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE meta_key = %s", $table_prefix.'user_level') );
-    $wpdb->query( $wpdb->prepare("DELETE FROM $wpdb->usermeta WHERE meta_key = %s", $table_prefix.'capabilities') );
+    $wpdb->delete( $wpdb->usermeta, array( 'meta_key' => $table_prefix.'user_level' ) );
+
+    $wpdb->delete( $wpdb->usermeta, array( 'meta_key' => $table_prefix.'capabilities' ) );
 
     $wpdb->suppress_errors( false );