X-Git-Url: https://git.sesse.net/?p=pr0n;a=blobdiff_plain;f=perl%2FSesse%2Fpr0n%2FWebDAV.pm;h=2cadbcd4aa60cf72d12be54f2aedf120438fa484;hp=6d116d072012748ac79d172c4035c641bcc566ec;hb=b5572d621fe221ee9dcbf990118dd6aa69125cda;hpb=5fa6b177211912e7f02e973a1043b519b5001cff

diff --git a/perl/Sesse/pr0n/WebDAV.pm b/perl/Sesse/pr0n/WebDAV.pm
index 6d116d0..2cadbcd 100644
--- a/perl/Sesse/pr0n/WebDAV.pm
+++ b/perl/Sesse/pr0n/WebDAV.pm
@@ -544,13 +544,7 @@ EOF
 		}
 		
 		# Ugh, Windows XP seems to be sending this in... something that's not UTF-8, at least
-		my $takenby_given;
-		eval {
-			$takenby_given = Encode::decode("utf-8", $apr->param('takenby'), Encode::FB_CROAK);
-		};
-		if ($@) {
-			$takenby_given = Encode::decode("iso8859-1", $apr->param('takenby'));
-		}
+		my $takenby_given = Sesse::pr0n::Common::guess_charset($apr->param('takenby'));
 
 		if (defined($takenby_given) && $takenby_given !~ /^\s*$/ && $takenby_given !~ /[<>&]/ && length($takenby_given) <= 100) {
 			$takenby = $takenby_given;