From: Sebastian Spaeth <Sebastian@SSpaeth.de>
Date: Thu, 12 Dec 2013 17:12:13 +0000 (+0100)
Subject: Add the profile_hook in case of user with or without media
X-Git-Url: https://vcs.fsf.org/?a=commitdiff_plain;h=fcdc976ffd27bc2b93ec8e2997fc0884b2a0b480;p=mediagoblin.git

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...
---

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 %}