Merge remote-tracking branch 'origin/hyperscript'

2017-07-18 15:43:04 -10:00
parent 07ff4c602e ccc712bad7
commit d9737b8da7
2 changed files with 41 additions and 26 deletions
@@ -173,7 +173,7 @@ exports.init = function (sbot, config) {
 		      }
 		  })
 		  
-		  serveFeeds(req, res, following, channelSubscriptions, feedId, 'user feed ' + about.name)
+		  serveFeeds(req, res, following, channelSubscriptions, feedId, 'user feed ' + (about ? about.name : ""))
 	      })
 	  )
      })
@@ -225,7 +225,7 @@ exports.init = function (sbot, config) {
 		  pull.values(logs),
 		  paramap(addAuthorAbout, 8),
 		  paramap(addVoteMessage, 8),
-		  pull(renderThread(defaultOpts,
+		  pull(renderThread(defaultOpts, '',
 				    renderShowAll(showAll, req.url)),
 		       wrapPage('#' + channelId)),
 		  toPull(res, function (err) {