Merge pull request #1412 from mattermost/plt-1089

PLT-1089 Fix profile not loading in RHS on refresh

web/react/components/user_profile.jsx

@@ -29,7 +29,7 @@ export default class UserProfile extends React.Component {
             return {profile: {id: '0', username: '...'}};
         }
 
-        return {profile: profile};
+        return {profile};
     }
     componentDidMount() {
         UserStore.addChangeListener(this.onChange);

web/react/stores/user_store.jsx

@@ -164,6 +164,10 @@ class UserStoreClass extends EventEmitter {
     }
 
     getProfile(userId) {
+        if (userId === this.getCurrentId()) {
+            return this.getCurrentUser();
+        }
+
         return this.getProfiles()[userId];
     }