From 0d813d191af5ef6cdea8bca735a6b4bfca868864 Mon Sep 17 00:00:00 2001
From: bwarsaw
Date: Sat, 9 Jan 1999 04:35:21 +0000
Subject: main(): in previous VARHELP workaround, QUERY_STRING could exist but
 be an empty string.

---
 Mailman/Cgi/admin.py | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

(limited to 'Mailman')

diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py
index 55aacb603..3c4a3687f 100644
--- a/Mailman/Cgi/admin.py
+++ b/Mailman/Cgi/admin.py
@@ -135,11 +135,12 @@ def main():
         if cgi_data.has_key('VARHELP'):
             varhelp = cgi_data['VARHELP'].value
         elif cgi_data.has_key('request_login') and \
-             os.environ.has_key('QUERY_STRING'):
+             os.environ.get('QUERY_STRING'):
             # POST methods, even if their actions have a query string, don't
             # get put into FieldStorage's keys :-(
-            qs = cgi.parse_qs(os.environ['QUERY_STRING'])
-            varhelp = qs.get('VARHELP')[0]
+            qs = cgi.parse_qs(os.environ['QUERY_STRING']).get('VARHELP')
+            if qs and type(qs) == types.ListType:
+                varhelp = qs[0]
         if varhelp:
             FormatOptionHelp(doc, varhelp, lst)
             print doc.Format(bgcolor="#ffffff")
-- 
cgit v1.2.3-70-g09d2