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

diff --git a/mediagoblin/templates/mediagoblin/user_pages/user.html b/mediagoblin/templates/mediagoblin/user_pages/user.html
index 9d99ac53640e0e8f04657d4541f28fbb05f3ecf8..a2b85aff5651dd4681df473ed36c375dc6bdd218 100644 (file)
--- 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 %}

diff --git a/user_profile-fix_wrong_nesting.patch b/user_profile-fix_wrong_nesting.patch
deleted file mode 100644 (file)
index 590f87f..0000000
--- a/user_profile-fix_wrong_nesting.patch
+++ /dev/null
@@ -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 %}