aboutsummaryrefslogtreecommitdiffstats
path: root/mediagoblin/api/views.py
diff options
context:
space:
mode:
authorBoris Bobrov <breton@cynicmansion.ru>2016-02-05 04:32:07 +0300
committerBoris Bobrov <breton@cynicmansion.ru>2016-02-05 04:32:07 +0300
commit157ee14b149ed42962488c92368964d070d7b706 (patch)
treec98f3f4f59329816aabd23d55561b4a902d00421 /mediagoblin/api/views.py
parent45189f6dfb50198a0ade35a4b560a7c592d4f610 (diff)
parent5573c41054236b583d932ebe730e8b493bf52f37 (diff)
downloadmediagoblin-157ee14b149ed42962488c92368964d070d7b706.tar.lz
mediagoblin-157ee14b149ed42962488c92368964d070d7b706.tar.xz
mediagoblin-157ee14b149ed42962488c92368964d070d7b706.zip
Merge branch 'master' of git.sv.gnu.org:/srv/git/mediagoblin
Diffstat (limited to 'mediagoblin/api/views.py')
-rw-r--r--mediagoblin/api/views.py7
1 files changed, 6 insertions, 1 deletions
diff --git a/mediagoblin/api/views.py b/mediagoblin/api/views.py
index dcd04cd6..74181fde 100644
--- a/mediagoblin/api/views.py
+++ b/mediagoblin/api/views.py
@@ -587,7 +587,12 @@ def feed_endpoint(request, outbox=None):
outbox = outbox.limit(limit)
# Offset (default: no offset - first <count> result)
- outbox = outbox.offset(request.args.get("offset", 0))
+ offset = request.args.get("offset", 0)
+ try:
+ offset = int(offset)
+ except ValueError:
+ offset = 0
+ outbox = outbox.offset(offset)
# Build feed.
for activity in outbox: