Fixes for FS#7980

packages/views.py

@@ -165,7 +165,8 @@ def flag(request, pkgid):
 @login_required
 def unflag(request, pkgid):
     pkg = get_object_or_404(Package, id=pkgid)
-    if pkg.maintainer.username != request.user.username:
+    if pkg.maintainer_id == 0 or \
+        pkg.maintainer.username != request.user.username:
         return render_response(request, 'error_page.html', {'errmsg': 'You do not own this package.'})
     pkg.needupdate = 0
     pkg.save()

templates/packages/details.html

@@ -11,9 +11,9 @@ <h2 class="title">{{ pkg.pkgname }} {{ pkg.pkgver }}-{{ pkg.pkgrel }}</h2>
 				<li>
 			{% if pkg.needupdate %}
 				<span style="font-size:x-small"><em>This package has been flagged out-of-date</em></span>
-				{% if not user.is_anonymous %}{% if pkg.maintainer %}{% ifequal user.username pkg.maintainer.username %}
-					<br />&nbsp; &nbsp; <a href="/packages/unflag/{{ pkg.id }}/">Click here to unflag</a>
-				{% endifequal %}{% endif %}{% endif %}
+				{% if not user.is_anonymous %}
+                <br />&nbsp; &nbsp; <a href="/packages/unflag/{{ pkg.id }}/">Click here to unflag</a>
+				{% endif %}
 			{% else %}
 				<a href="/packages/flag/{{ pkg.id }}/" onclick="return !window.open('/packages/flag/{{ pkg.id }}/','FlagHelp','height=250,width=450,location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=no');">Flag Package Out-of-Date</a>
 				<a href="/packages/flaghelp" onclick="return !window.open('/packages/flaghelp','FlagHelp','height=250,width=450,location=no,scrollbars=yes,menubars=no,toolbars=no,resizable=no');"><span style="font-size:x-small">(?)</span></a>