aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorSebastian Spaeth <Sebastian@SSpaeth.de>2013-12-12 18:12:13 +0100
committerSebastian Spaeth <Sebastian@SSpaeth.de>2013-12-12 18:12:13 +0100
commitfcdc976ffd27bc2b93ec8e2997fc0884b2a0b480 (patch)
treeb2c059577cf2399bd85b3c2fe946bfde54e8e98a
parent461cd7c10d67e04cde4155f32bcd13d174318ba2 (diff)
downloadmediagoblin-fcdc976ffd27bc2b93ec8e2997fc0884b2a0b480.tar.lz
mediagoblin-fcdc976ffd27bc2b93ec8e2997fc0884b2a0b480.tar.xz
mediagoblin-fcdc976ffd27bc2b93ec8e2997fc0884b2a0b480.zip
Add the profile_hook in case of user with or without media
the hook was only run in case the user had no media uploaded yet. This does not make any sense, so we run the hook in all cases now. The designers might have to think about the placement of the stuff being inserted at some point...
-rw-r--r--mediagoblin/templates/mediagoblin/user_pages/user.html6
1 files changed, 1 insertions, 5 deletions
diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html
index d554b7e8..14a67431 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/user.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
@@ -111,11 +111,6 @@
href="{{ request.urlgen('mediagoblin.submit.start') }}">
{%- trans %}Add media{% endtrans -%}
</a>
- {% set feed_url = request.urlgen(
- 'mediagoblin.user_pages.atom_feed',
- user=user.username) %}
- {% template_hook("user_profile") %}
- {% include "mediagoblin/utils/feed_link.html" %}
</div>
{% else %}
<div class="profile_showcase empty_space">
@@ -127,5 +122,6 @@
</div>
{% endif %}
{% endif %}
+ {% template_hook("user_profile") %}
<div class="clear"></div>
{% endblock %}