fix showing userpicture.png

lib/util/middlewares.js

@@ -67,7 +67,7 @@ exports.swigFilters = function(app, swig) {
 
   // define a function for uploaded picture
   const getUploadedPictureSrc = function(user) {
-    if (user.image !== undefined) {
+    if (user.image) {
       return user.image;
     }
     else {
@@ -147,7 +147,7 @@ exports.swigFilters = function(app, swig) {
 
     swig.setFilter('picture', function(user) {
       if (!user) {
-        return '';
+        return '/images/userpicture.png';
       }
 
       if (user.isGravatarEnabled === true) {

resource/js/components/User/UserPicture.js

@@ -10,11 +10,8 @@ export default class UserPicture extends React.Component {
       return this.generateGravatarSrc(user);
     }
     // uploaded image
-    else if (user.image && user.image != '/images/userpicture.png') {
-      return user.image;
-    }
     else {
-      return '/images/userpicture.png';
+      return user.image || '/images/userpicture.png';
     }
   }
 

resource/js/legacy/crowi.js

@@ -103,11 +103,7 @@ Crowi.userPicture = function (user) {
     return '/images/userpicture.png';
   }
 
-  if (user.image && user.image != '/images/userpicture.png') {
-    return user.image;
-  } else {
-    return '/images/userpicture.png';
-  }
+  return user.image || '/images/userpicture.png';
 };
 
 Crowi.modifyScrollTop = function() {