Merge branch 'master' of git://gitorious.org/mediagoblin/mediagoblin

2013-08-25 09:24:13 +05:30
parent 70cc6eb8f3 e8eec575f3
commit 7d9dbe32cc
42 changed files with 2240 additions and 585 deletions
--- a/mediagoblin/user_pages/views.py
+++ b/mediagoblin/user_pages/views.py
@@ -323,8 +323,9 @@ def media_confirm_delete(request):
            if not location:
                location=media.url_to_prev(request.urlgen)
            if not location:
-                location="mediagoblin.user_pages.user_home"
-            return redirect(request, location=location, user=username)
+                location=request.urlgen("mediagoblin.user_pages.user_home",
+                                        user=username)
+            return redirect(request, location=location)
        else:
            messages.add_message(
                request, messages.ERROR,