[Slim-Checkins] r10563 - /trunk/server/Slim/Utils/Unicode.pm

[dsully at svn.slimdevices.com]

Author: dsully
Date: Thu Nov  2 15:01:27 2006
New Revision: 10563

URL: http://svn.slimdevices.com?rev=10563&view=rev
Log:
Bug: N/A
Description: Move Encode::Detect() checking to after standard Unicode checking.

Modified:
    trunk/server/Slim/Utils/Unicode.pm

Modified: trunk/server/Slim/Utils/Unicode.pm
URL: http://svn.slimdevices.com/trunk/server/Slim/Utils/Unicode.pm?rev=10563&r1=10562&r2=10563&view=diff
==============================================================================
--- trunk/server/Slim/Utils/Unicode.pm (original)
+++ trunk/server/Slim/Utils/Unicode.pm Thu Nov  2 15:01:27 2006
@@ -765,17 +765,6 @@
 
 	my $encoding = 'raw';
 
-	# Try and using Encode::Detect if we have it installed.
-	if ($encodeDetect && $_[0] && !Encode::is_utf8($_[0])) {
-
-		my $charset = Encode::Detect::Detector::detect($_[0]);
-
-		if ($charset) {
-
-			return lc($charset);
-		}
-	}
-
 	# Don't copy a potentially large string - just read it from the stack.
 	if (looks_like_ascii($_[0])) {
 
@@ -800,6 +789,10 @@
 	} elsif (looks_like_cp1252($_[0])) {
 	
 		$encoding = 'cp1252';
+
+	} elsif ($encodeDetect && $_[0] && !Encode::is_utf8($_[0])) {
+
+		$encoding  = lc(Encode::Detect::Detector::detect($_[0]));
 	}
 
 	return $encoding;