Merge branch 'master' of gitorious.org:mediagoblin/mediagoblin into metadata

Conflicts:
	mediagoblin/gmg_commands/__init__.py

1 files changed, 6 insertions, 0 deletions

diff --git a/mediagoblin/db/mixin.py b/mediagoblin/db/mixin.py
index 25ce6642..048cc07c 100644
--- a/mediagoblin/db/mixin.py
+++ b/mediagoblin/db/mixin.py
@@ -46,6 +46,12 @@ class UserMixin(object):
     def bio_html(self):
         return cleaned_markdown_conversion(self.bio)
 
+    def url_for_self(self, urlgen, **kwargs):
+        """Generate a URL for this User's home page."""
+        return urlgen('mediagoblin.user_pages.user_home',
+                      user=self.username, **kwargs)
+
+
 class GenerateSlugMixin(object):
     """
     Mixin to add a generate_slug method to objects.