Merge tag 'release_2012-02-18'

Defend against bogus URLs, mirrorlist no FTP by default

Conflicts:
	templates/public/index.html

2 files changed, 4 insertions, 4 deletions

diff --git a/packages/views/__init__.py b/packages/views/__init__.py
index 9ca21407..08e0286c 100644
--- a/packages/views/__init__.py
+++ b/packages/views/__init__.py
@@ -142,7 +142,7 @@ def details(request, name='', repo='', arch=''):
             ('q',    name),
         ]
         # only include non-blank values in the query we generate
-        pkg_data = [(x, y) for x, y in pkg_data if y]
+        pkg_data = [(x, y.encode('utf-8')) for x, y in pkg_data if y]
         return redirect("/packages/?%s" % urlencode(pkg_data))
 
 def groups(request, arch=None):
diff --git a/packages/views/flag.py b/packages/views/flag.py
index ad1b04db..e87cef69 100644
--- a/packages/views/flag.py
+++ b/packages/views/flag.py
@@ -18,9 +18,9 @@ def flaghelp(request):
     return direct_to_template(request, 'packages/flaghelp.html')
 
 class FlagForm(forms.Form):
-    email = forms.EmailField(label='* E-mail Address')
-    message = forms.CharField(label='Message To Dev',
-            widget=forms.Textarea, required=False)
+    email = forms.EmailField(label='E-mail Address')
+    message = forms.CharField(label='Message To Developer',
+            widget=forms.Textarea)
     # The field below is used to filter out bots that blindly fill out all
     # input elements
     website = forms.CharField(label='',