|
@@ -281,17 +281,19 @@ class Base
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|
|
- ksort($drop);
|
|
|
|
- $combine = array();
|
|
|
|
- $combine['status'] = 1;
|
|
|
|
- $combine['new_uid'] = $cur;
|
|
|
|
- $combine['old_uid'] = implode(',', $drop);
|
|
|
|
- $info = Dever::db('passport/combine')->one($combine);
|
|
|
|
- if (!$info) {
|
|
|
|
- Dever::db('passport/combine')->insert($combine);
|
|
|
|
- }
|
|
|
|
|
|
+ if ($drop) {
|
|
|
|
+ ksort($drop);
|
|
|
|
+ $combine = array();
|
|
|
|
+ $combine['status'] = 1;
|
|
|
|
+ $combine['new_uid'] = $cur;
|
|
|
|
+ $combine['old_uid'] = implode(',', $drop);
|
|
|
|
+ $info = Dever::db('passport/combine')->one($combine);
|
|
|
|
+ if (!$info) {
|
|
|
|
+ Dever::db('passport/combine')->insert($combine);
|
|
|
|
+ }
|
|
|
|
|
|
- Dever::load('passport/user-updates', array('set_state' => 2, 'where_id' => $combine['old_uid']));
|
|
|
|
|
|
+ Dever::load('passport/user-updates', array('set_state' => 2, 'where_id' => $combine['old_uid']));
|
|
|
|
+ }
|
|
}
|
|
}
|
|
}
|
|
}
|
|
|
|
|