Use the correct URL parameter separator (&)

diff --git a/lib/Packages/DoSearch.pm b/lib/Packages/DoSearch.pm
index d8aa6d8194dbe97ffccffefaf83395052058db12..53a6f082aa0a727af610acd96d6feacf27f6530f 100644 (file)
--- a/lib/Packages/DoSearch.pm
+++ b/lib/Packages/DoSearch.pm
@@ -39,7 +39,7 @@ sub do_search {
     my $suites_param = join ',', @{$params->{values}{suite}{no_replace}};
     my $sections_param = join ',', @{$params->{values}{section}{no_replace}};
     my $archs_param = join ',', @{$params->{values}{arch}{no_replace}};
     my $suites_param = join ',', @{$params->{values}{suite}{no_replace}};
     my $sections_param = join ',', @{$params->{values}{section}{no_replace}};
     my $archs_param = join ',', @{$params->{values}{arch}{no_replace}};

-    $opts->{common_params} = "suite=$suites_param;section=$sections_param;keywords=$keyword_esc;searchon=$searchon;arch=$archs_param";
+    $opts->{common_params} = "suite=$suites_param&section=$sections_param&keywords=$keyword_esc&searchon=$searchon&arch=$archs_param";

 
     # for output
     my $keyword_enc = encode_entities $keyword || '';
 
     # for output
     my $keyword_enc = encode_entities $keyword || '';


@@ -126,7 +126,10 @@ sub do_search {
            
            if ($opts->{exact}) {
                $printed++;
            
            if ($opts->{exact}) {
                $printed++;

-               hint( "You have searched only for words exactly matching your keywords. You can try to search <a href=\"$SEARCH_URL?exact=0;$opts->{common_params}\">allowing subword matching</a>." );
+               hint( "You have searched only for words exactly matching your
+                       keywords. You can try to search <a href=\"".
+                       encode_entities("$SEARCH_URL?exact=0&$opts->{common_params}")."\">allowing
+                       subword matching</a>." );

            }
        }
        hint( ( $printed ? "Or you" : "You" )." can try a different search on the <a href=\"$SEARCH_PAGE#search_packages\">Packages search page</a>." );
            }
        }
        hint( ( $printed ? "Or you" : "You" )." can try a different search on the <a href=\"$SEARCH_PAGE#search_packages\">Packages search page</a>." );


@@ -246,7 +249,7 @@ sub print_packages {
                                  map { $_->{$pkg}||{} } @func_args );
        }
     } elsif (@$pkgs_list) {
                                  map { $_->{$pkg}||{} } @func_args );
        }
     } elsif (@$pkgs_list) {

-       $str .= "<p><a href=\"$SEARCH_URL?exact=0;$opts->{common_params}\">".
+       $str .= "<p><a href=\"".encode_entities("$SEARCH_URL?exact=0&$opts->{common_params}")."\">".

            ($#{$pkgs_list}+1)."</a> results have not been displayed because you requested only exact matches.</p>";
     }
     $str .= '</div>';
            ($#{$pkgs_list}+1)."</a> results have not been displayed because you requested only exact matches.</p>";
     }
     $str .= '</div>';