edit

lib/Base.php

@@ -212,7 +212,7 @@ class Base
                 if ($v['temp'] == 2 && $cur != $v['uid']) {
                     $drop[$cur] = $cur;
                     $cur = $v['uid'];
-                } elseif ($v['avatar']) {
+                } elseif ($v['avatar'] && $cur != $v['uid']) {
                     $drop[$cur] = $cur;
                     $cur = $v['uid'];
                 } else {