From 5fe798b52f25a2895dced9e69dafe99491e61b39 Mon Sep 17 00:00:00 2001
From: =?utf8?q?Peter=20M=C3=BCller?= <peter.mueller@ipfire.org>
Date: Fri, 9 Oct 2020 19:20:32 +0000
Subject: [PATCH] tor.cgi: fix calling Perl location module functions
MIME-Version: 1.0
Content-Type: text/plain; charset=utf8
Content-Transfer-Encoding: 8bit

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 | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/html/cgi-bin/tor.cgi b/html/cgi-bin/tor.cgi
index 28dec6cf0d..7447bd7916 100644
--- a/html/cgi-bin/tor.cgi
+++ b/html/cgi-bin/tor.cgi
@@ -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'";
 
-- 
2.39.2