edit

lib/Base.php

@@ -246,19 +246,6 @@ class Base
                 print_r($drop);die;
             }
             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']));
-
-                $update = array();
                 foreach ($drop as $k => $v) {
                     if ($cur == $v) {
                         unset($drop[$k]);
@@ -294,6 +281,18 @@ class Base
                         Dever::load('passport/user-update', $update);
                     }
                 }
+
+                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']));
             }
         }