summaryrefslogtreecommitdiff
blob: a1c4e080614ae54fc6e5ec1d8a03d081203ec8e7 (plain)
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
--- Slim/Formats/XML.pm.old	2009-01-17 21:27:29.000000000 +0000
+++ Slim/Formats/XML.pm	2009-01-17 21:40:14.000000000 +0000
@@ -13,7 +13,7 @@
 use strict;
 use File::Slurp;
 use HTML::Entities;
-use JSON::XS qw(from_json);
+use JSON::XS qw(decode_json);
 use Scalar::Util qw(weaken);
 use URI::Escape qw(uri_escape);
 use XML::Simple;
@@ -288,7 +288,7 @@
 	my $xml;
 	
 	if ( $type =~ /json/ ) {
-		$xml = from_json($$content);
+		$xml = decode_json($$content);
 	}
 	else {
 		$xml = xmlToHash($content);