Merge branch 'master' of github.com:samuelclay/NewsBlur

* 'master' of github.com:samuelclay/NewsBlur:
  Handling iphone version for new users on ios app.
This commit is contained in:
Samuel Clay 2011-12-17 13:05:20 -08:00
commit 110d5206d6

View file

@ -226,6 +226,7 @@ def load_feeds_flat(request):
user = request.user
include_favicons = request.REQUEST.get('include_favicons', False)
feeds = {}
iphone_version = "1.2"
if include_favicons == 'false': include_favicons = False
@ -235,7 +236,7 @@ def load_feeds_flat(request):
try:
folders = UserSubscriptionFolders.objects.get(user=user)
except UserSubscriptionFolders.DoesNotExist:
data = dict(folders=[])
data = dict(folders=[], iphone_version=iphone_version)
return data
user_subs = UserSubscription.objects.select_related('feed').filter(user=user, active=True)
@ -269,7 +270,7 @@ def load_feeds_flat(request):
make_feeds_folder(folder, flat_folder_name, depth+1)
make_feeds_folder(folders)
data = dict(flat_folders=flat_folders, feeds=feeds, user=user.username, iphone_version="1.2")
data = dict(flat_folders=flat_folders, feeds=feeds, user=user.username, iphone_version=iphone_version)
return data
@ratelimit(minutes=1, requests=10)