gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge branch 'jameskopacz-patch-261' of https://github.com/jameskopacz/freecodecamp into jameskopacz-jameskopacz-patch-261

Browse Source 
Conflicts:
	controllers/courseware.js
This commit is contained in:
Berkeley Martinez
2015-03-31 13:43:58 -07:00
parent b6dc82805d c17ff59aef
commit e04470872e
5 changed files with 46 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
controllers/resources.js
View File

@ -175,7 +175,9 @@ module.exports = {
if (req.user) {
if (!req.user.profile.picture || req.user.profile.picture === "https://s3.amazonaws.com/freecodecamp/favicons/apple-touch-icon-180x180.png") {
req.user.profile.picture = "https://s3.amazonaws.com/freecodecamp/camper-image-placeholder.png";
req.user.save();
req.user.save(function(err) {
if (err) return next(err);
});
}
}
var date1 = new Date("10/15/2014");