From mboxrd@z Thu Jan  1 00:00:00 1970
From: Michael Tremer <michael.tremer@ipfire.org>
To: development@lists.ipfire.org
Subject: Re: [PATCH v2] tor.cgi: fix calling Perl location module functions
Date: Sat, 10 Oct 2020 12:46:09 +0100
Message-ID: <64EE2BF8-BB1E-452A-83AC-2B9ACC3A796C@ipfire.org>
In-Reply-To: <190f0a6c-c334-24d3-28ca-7f732aa0fc85@ipfire.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3534809138416180941=="
List-Id: <development.lists.ipfire.org>

--===============3534809138416180941==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Could anyone please test this and confirm that it works?

> On 9 Oct 2020, at 20:20, Peter M=C3=BCller <peter.mueller(a)ipfire.org> wro=
te:
>=20
> The second version of this patch avoids re-defining $db_handle.
>=20
> Fixes: #12492
>=20
> Cc: Stefan Schantl <stefan.schantl(a)ipfire.org
> Signed-off-by: Peter M=C3=BCller <peter.mueller(a)ipfire.org>
> ---
> html/cgi-bin/tor.cgi | 5 ++---
> 1 file changed, 2 insertions(+), 3 deletions(-)
>=20
> diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi
> index 28dec6cf0..7447bd791 100644
> --- a/html/cgi-bin/tor.cgi
> +++ b/html/cgi-bin/tor.cgi
> @@ -322,14 +322,13 @@ END
> 					<select name=3D'TOR_EXIT_COUNTRY'>
> 						<option value=3D''>- $Lang::tr{'tor exit country any'} -</option>
> END
> -
> -		my @country_codes =3D &Location::database_countries();
> +		my @country_codes =3D &Location::database_countries($db_handle);
> 		foreach my $country_code (@country_codes) {
> 			# Convert country code into upper case format.
> 			$country_code =3D uc($country_code);
>=20
> 			# Get country name.
> -			my $country_name =3D &Location::Functions::get_country_name($country_co=
de);
> +			my $country_name =3D &Location::Functions::get_full_country_name($count=
ry_code);
>=20
> 			print "<option value=3D'$country_code'";
>=20
> --=20
> 2.26.2


--===============3534809138416180941==--