diff --git a/apps/reader/views.py b/apps/reader/views.py index 4ab16e138..ea94d0d95 100644 --- a/apps/reader/views.py +++ b/apps/reader/views.py @@ -58,7 +58,7 @@ def index(request): username = request.subdomain try: if '.' in username: - username = username.lsplit('.')[0] + username = username.split('.')[0] user = User.objects.get(username=username) except User.DoesNotExist: return HttpResponseRedirect('http://%s%s' % ( diff --git a/media/js/newsblur/reader/reader.js b/media/js/newsblur/reader/reader.js index 080060b12..e94fbc860 100644 --- a/media/js/newsblur/reader/reader.js +++ b/media/js/newsblur/reader/reader.js @@ -1306,8 +1306,12 @@ var slug = _.string.words(_.string.clean(feed.get('feed_title').replace(/[^a-z0-9\. ]/ig, ''))).join('-').toLowerCase(); var url = "social/" + feed.get('user_id') + "/" + slug; if (!_.string.include(window.location.pathname, url)) { + var params = {}; + if (_.string.include(window.location.pathname, "social/" + feed.get('user_id'))) { + params['replace'] = true; + } // console.log(["Navigating to social", url, window.location.pathname]); - NEWSBLUR.router.navigate(url); + NEWSBLUR.router.navigate(url, params); } } else if (!feed.get('feed_title')) { console.log(["No feed title on social", feed]); diff --git a/templates/social/social_page.xhtml b/templates/social/social_page.xhtml index 72f3df225..70a84f2b7 100644 --- a/templates/social/social_page.xhtml +++ b/templates/social/social_page.xhtml @@ -1,3 +1,5 @@ +{% load utils_tags %} + @@ -17,7 +19,7 @@

-