edit

lib/Base.php

@@ -225,6 +225,32 @@ class Base
                         Dever::db('passport/combine')->insert($insert);
                     }
                     Dever::load('passport/user-update', array('set_state' => 2, 'where_id' => $v));
+
+                    $new = Dever::load('passport/user')->one($cur);
+                    $old = Dever::load('passport/user')->one($v);
+
+                    $update = array();
+                    if ($new['temp'] == 1) {
+                        $update['username'] = $old['username'];
+                    }
+
+                    if (strstr($new['username'], '****')) {
+                        $update['username'] = $old['username'];
+                    }
+
+                    if (!$new['avatar']) {
+                        $update['avatar'] = $old['avatar'];
+                    }
+
+                    if (!$new['area']) {
+                        $update['area'] = $old['area'];
+                    }
+
+                    if (isset($update) && $update) {
+                        $update['where_id'] = $cur;
+                        Dever::load('passport/user-update', $update);
+                    }
+                    
                 }
                 $combine = Dever::project('combine');
                 if ($combine) {