--- TemplateDefault_MM.pm	2008-09-25 21:30:14.000000000 +0000
+++ TemplateDefault_MM_New.pm	2010-07-14 06:53:32.000000000 +0000
@@ -2,7 +2,7 @@
 # These routines format the HTML output.
 #    $Id: TemplateDefault.pm,v 1.3 2003/05/13 06:11:33 whmoseley Exp $
 #=====================================================================
-package SWISH::TemplateDefault;
+package SWISH::TemplateDefault_MM;  # Mailman customization (package name)
 use strict;
 
 use CGI;
@@ -105,7 +105,8 @@
 
     my $form = $q->script_name;
 
-    my $advanced_link = qq[<small><a href="$form">advanced form</a></small>]; 
+    # Mailman customization to add $ENV{'PATH_INFO'} after $form
+    my $advanced_link = qq[<small><a href="$form$ENV{'PATH_INFO'}">advanced form</a></small>]; 
 
     my $advanced_form = $q->param('brief')
                         ? $advanced_link
@@ -122,9 +123,9 @@
                  : join "\n", map { $q->hidden($_) } @$extra; 
 
 
-    
+    # Mailman customization to add $ENV{'PATH_INFO'} after $form
     return <<EOF;
-    <form method="get" action="$form" enctype="application/x-www-form-urlencoded" class="form">
+    <form method="get" action="$form$ENV{'PATH_INFO'}" enctype="application/x-www-form-urlencoded" class="form">
         <input maxlength="200" value="$query" size="32" type="text" name="query"/>
         $hidden
         <input value="Search!" type="submit" name="submit"/><br>
@@ -183,6 +184,10 @@
     my $query_simple = CGI::escapeHTML( $results->{query_simple} );
     my $pages       = $results->navigation('pages');
 
+    # Mailman customizations to add $ENV{'PATH_INFO'} between search and ?
+    $query_href =~ s#search\?#search$ENV{'PATH_INFO'}\?#g;
+    $pages =~ s#search\?#search$ENV{'PATH_INFO'}\?#g;
+
     my $prev        = $results->navigation('prev');
     my $prev_count  = $results->navigation('prev_count');
     my $next        = $results->navigation('next');