summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorCorey Hulen <corey@hulen.com>2015-08-24 13:09:25 -0700
committerCorey Hulen <corey@hulen.com>2015-08-24 13:09:25 -0700
commit930488f002c819efed7e3afc982b73d1c06a9bbe (patch)
tree7f16a48d0ab7adb7471761c2d574ad6bc07fac4f
parent106cff41952f209f9a4a243f1a504faf5ccc0f66 (diff)
parentb2c16401c80327f333ff61130593b7a2d3d0b640 (diff)
downloadchat-930488f002c819efed7e3afc982b73d1c06a9bbe.tar.gz
chat-930488f002c819efed7e3afc982b73d1c06a9bbe.tar.bz2
chat-930488f002c819efed7e3afc982b73d1c06a9bbe.zip
Merge pull request #465 from rgarmsen2295/prof-img-fix
Fixes issue with site trying to load profile pictures without having profile information
-rw-r--r--web/react/components/post.jsx7
1 files changed, 6 insertions, 1 deletions
diff --git a/web/react/components/post.jsx b/web/react/components/post.jsx
index 53ffeb400..cc2e37fa8 100644
--- a/web/react/components/post.jsx
+++ b/web/react/components/post.jsx
@@ -102,7 +102,12 @@ module.exports = React.createClass({
currentUserCss = "current--user";
}
- var timestamp = UserStore.getProfile(post.user_id).update_at;
+ var userProfile = UserStore.getProfile(post.user_id);
+
+ var timestamp = UserStore.getCurrentUser().update_at;
+ if (userProfile) {
+ timestamp = userProfile.update_at;
+ }
return (
<div>