summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authordonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-09-06 15:41:17 +0000
committerdonncha <donncha@7be80a69-a1ef-0310-a953-fb0f7c49ff36>2005-09-06 15:41:17 +0000
commit0f18897b9fcb5ab55a9a4df73a71e4aeb52a6db7 (patch)
tree98581c2a8740ea15f5a56434a6684d30cd91ecc7
parentcf99c632672c0d0212cf534f102dd9a6c4e49183 (diff)
md5()_invited_by -> invited_by
git-svn-id: http://svn.automattic.com/wordpress-mu/trunk@300 7be80a69-a1ef-0310-a953-fb0f7c49ff36
-rw-r--r--wp-inst/wp-admin/invites.php9
-rw-r--r--wp-inst/wp-content/mu-plugins/invites.php4
2 files changed, 8 insertions, 5 deletions
diff --git a/wp-inst/wp-admin/invites.php b/wp-inst/wp-admin/invites.php
index 3d769fb..a0f1410 100644
--- a/wp-inst/wp-admin/invites.php
+++ b/wp-inst/wp-admin/invites.php
@@ -116,8 +116,13 @@ if( $invites_list != '' )
reset( $invites );
while( list( $key, $val ) = each( $invites ) ) {
if( $val != "" ) {
- $row = $wpdb->get_row( "SELECT * FROM $wpdb->usermeta WHERE meta_key = '" . md5( $val ) . "_invited_by' AND meta_value = '" . $current_user->data->ID. "'" );
- $invited_user_id = $row->user_id;
+ $id = $wpdb->get_row( "SELECT ID FROM {$wpdb->users} WHERE user_email = '$val'" );
+ if( $id ) {
+ $invited_user_id = $id->ID;
+ } else {
+ $invited_user_id = 0;
+ }
+
if( $invited_user_id != 0 ) {
$invited_user_blog = $wpdb->get_var( "SELECT meta_value FROM $wpdb->usermeta WHERE user_id = '$invited_user_id' AND meta_key='source_domain'" );
} else {
diff --git a/wp-inst/wp-content/mu-plugins/invites.php b/wp-inst/wp-content/mu-plugins/invites.php
index a778969..b64592d 100644
--- a/wp-inst/wp-content/mu-plugins/invites.php
+++ b/wp-inst/wp-content/mu-plugins/invites.php
@@ -136,9 +136,7 @@ function invites_cleanup_db( $val ) {
$id = $wpdb->get_var( "SELECT ID FROM ".$wpdb->users." WHERE user_login = '" . $_POST[ 'weblog_id' ] . "'" );
if( $id ) {
- $query = "UPDATE ".$wpdb->usermeta."
- SET user_id = '".$id."'
- WHERE meta_key = '".$_POST[ 'u' ]."_invited_by'";
+ $query = "UPDATE ".$wpdb->usermeta." SET user_id = '".$id."', meta_key = 'invited_by' WHERE meta_key = '".$_POST[ 'u' ]."_invited_by'";
$wpdb->query( $query );
}
}