]> git.ipfire.org Git - ipfire-2.x.git/commitdiff
tor.cgi: fix calling Perl location module functions
authorPeter Müller <peter.mueller@ipfire.org>
Fri, 9 Oct 2020 19:20:32 +0000 (19:20 +0000)
committerMichael Tremer <michael.tremer@ipfire.org>
Mon, 12 Oct 2020 20:14:33 +0000 (20:14 +0000)
The second version of this patch avoids re-defining $db_handle.

Fixes: #12492
Cc: Stefan Schantl <stefan.schantl@ipfire.org
Signed-off-by: Peter Müller <peter.mueller@ipfire.org>
Acked-By: Stefan Schantl <stefan.schantl@ipfire.org>
Signed-off-by: Michael Tremer <michael.tremer@ipfire.org>
html/cgi-bin/tor.cgi

index 28dec6cf0d838448646a3d84e5bc744746eb86dd..7447bd79160c85a64593c369bbb45545c226af1f 100644 (file)
@@ -322,14 +322,13 @@ END
                                        <select name='TOR_EXIT_COUNTRY'>
                                                <option value=''>- $Lang::tr{'tor exit country any'} -</option>
 END
-
-               my @country_codes = &Location::database_countries();
+               my @country_codes = &Location::database_countries($db_handle);
                foreach my $country_code (@country_codes) {
                        # Convert country code into upper case format.
                        $country_code = uc($country_code);
 
                        # Get country name.
-                       my $country_name = &Location::Functions::get_country_name($country_code);
+                       my $country_name = &Location::Functions::get_full_country_name($country_code);
 
                        print "<option value='$country_code'";