Fixed admin.py so null VARHELP category is handled (1573393).

2 files changed, 9 insertions, 4 deletions

diff --git a/Mailman/Cgi/admin.py b/Mailman/Cgi/admin.py
index f70a0721..718bb0c8 100644
--- a/Mailman/Cgi/admin.py
+++ b/Mailman/Cgi/admin.py
@@ -319,10 +319,11 @@ def option_help(mlist, varhelp):
         elif len(reflist) == 3:
             category, subcat, varname = reflist
         options = mlist.GetConfigInfo(category, subcat)
-        for i in options:
-            if i and i[0] == varname:
-                item = i
-                break
+        if options:
+            for i in options:
+                if i and i[0] == varname:
+                    item = i
+                    break
     # Print an error message if we couldn't find a valid one
     if not item:
         bad = _('No valid variable name found.')
diff --git a/NEWS b/NEWS
index 53b92f2f..5d11cba3 100644
--- a/NEWS
+++ b/NEWS
@@ -6,6 +6,10 @@ Here is a history of user visible changes to Mailman.
 
 2.1.10 (XX-XXX-200X)
 
+  Bug fixes and other patches
+
+    - Fixed admin.py so null VARHELP category is handled (1573393).
+
 2.1.9 (12-Sep-2006)
 
   Security