Now actually apply Velmont's patch instead of just committing it ;)

This commit is contained in:
Christopher Allan Webber 2011-07-25 15:30:56 -05:00
parent 2684f341f5
commit ad74472b59
2 changed files with 3 additions and 20 deletions

View File

@ -42,9 +42,9 @@
<a href={{ request.urlgen( <a href={{ request.urlgen(
'mediagoblin.user_pages.atom_feed', 'mediagoblin.user_pages.atom_feed',
user=user.username) }}>atom feed</a> user=user.username) }}>atom feed</a>
{% else %}
{# This *should* not occur as the view makes sure we pass in a user. #}
<p>Sorry, no such user found.<p/>
</div> </div>
{% else %}
{# This *should* not occur as the view makes sure we pass in a user. #}
<p>Sorry, no such user found.<p/>
{% endif %} {% endif %}
{% endblock %} {% endblock %}

View File

@ -1,17 +0,0 @@
diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html
index 9d99ac5..a2b85af 100644
--- a/mediagoblin/templates/mediagoblin/user_pages/user.html
+++ b/mediagoblin/templates/mediagoblin/user_pages/user.html
@@ -42,9 +42,9 @@
<a href={{ request.urlgen(
'mediagoblin.user_pages.atom_feed',
user=user.username) }}>atom feed</a>
- {% else %}
- {# This *should* not occur as the view makes sure we pass in a user. #}
- <p>Sorry, no such user found.<p/>
</div>
+ {% else %}
+ {# This *should* not occur as the view makes sure we pass in a user. #}
+ <p>Sorry, no such user found.<p/>
{% endif %}
{% endblock %}