|
@@ -209,12 +209,21 @@ class Base
|
|
|
if (!isset($v['uid'])) {
|
|
|
$v['uid'] = $v['id'];
|
|
|
}
|
|
|
- if ($v['uid'] < $cur) {
|
|
|
+ if ($v['temp'] == 2 && $cur != $v['uid']) {
|
|
|
$drop[$cur] = $cur;
|
|
|
$cur = $v['uid'];
|
|
|
- } elseif ($v['uid'] > $cur) {
|
|
|
- $drop[$v['uid']] = $v['uid'];
|
|
|
+ } elseif ($v['avatar']) {
|
|
|
+ $drop[$cur] = $cur;
|
|
|
+ $cur = $v['uid'];
|
|
|
+ } else {
|
|
|
+ if ($v['uid'] < $cur) {
|
|
|
+ $drop[$cur] = $cur;
|
|
|
+ $cur = $v['uid'];
|
|
|
+ } elseif ($v['uid'] > $cur) {
|
|
|
+ $drop[$v['uid']] = $v['uid'];
|
|
|
+ }
|
|
|
}
|
|
|
+
|
|
|
}
|
|
|
if ($drop) {
|
|
|
foreach ($drop as $k => $v) {
|